Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
######################################################
# cmake file for building LCCD
# @author Jan Engels, DESY
CMAKE_MINIMUM_REQUIRED( VERSION 2.6 FATAL_ERROR )
CMAKE_MINIMUM_REQUIRED( VERSION 3.10 FATAL_ERROR )
######################################################


Expand Down
7 changes: 1 addition & 6 deletions source/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ INCLUDE_DIRECTORIES( BEFORE "${PROJECT_SOURCE_DIR}/source/include" )
INCLUDE_DIRECTORIES( ${PROJECT_BINARY_DIR} )


# omit warning about preprocessor definitions being escaped
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0005 OLD)
ENDIF()

# specific LCCD variable
IF( NOT LCCD_DB_INIT )
SET( LCCD_DB_INIT "localhost:lccd_test:calvin:hobbes" )
Expand All @@ -24,7 +19,7 @@ SET( LCCD_DB_INIT "${LCCD_DB_INIT}" CACHE STRING "DB initialization" FORCE )
#----- need long long for int64 for now ------
#FIXME: should establish wether we are on a 32bit or 64 bit machine ....
#ADD_DEFINITIONS( "-Wno-long-long" )
ADD_DEFINITIONS( "-DLCCD_DB_INIT_DEFAULT=\\\"${LCCD_DB_INIT}\\\"" )
ADD_DEFINITIONS( "-DLCCD_DB_INIT_DEFAULT=\"${LCCD_DB_INIT}\"" )


FILE( GLOB lccd_headers RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "./include/lccd/*.h?" )
Expand Down
Loading