X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2Fcommon.cmake;h=eeb8755cf51f6455438dcd820478624f742ab58d;hb=f57924a2649534451ac1ae5a2bdc63e0b6a0092d;hp=c5aac656907146989426622abd5486055c49a116;hpb=e79c7f94a4c1a8c79e0c4090922b796532192b62;p=clitk.git diff --git a/cmake/common.cmake b/cmake/common.cmake index c5aac65..eeb8755 100644 --- a/cmake/common.cmake +++ b/cmake/common.cmake @@ -5,7 +5,6 @@ ENDMACRO(DD) #========================================================= # Process ggo (gengetopt) files (http://www.gnu.org/software/gengetopt/) MACRO (WRAP_GGO GGO_SRCS) - MAKE_DIRECTORY(${CMAKE_BINARY_DIR}/ggo) FOREACH(GGO_FILE ${ARGN}) GET_FILENAME_COMPONENT(GGO_BASEFILENAME ${GGO_FILE} NAME_WE) GET_FILENAME_COMPONENT(GGO_FILE_ABS ${GGO_FILE} ABSOLUTE) @@ -27,11 +26,12 @@ MACRO (WRAP_GGO GGO_SRCS) SET(${GGO_SRCS} ${${GGO_SRCS}} ${CMAKE_CURRENT_BINARY_DIR}/${GGO_BASEFILENAME}_ggo.c) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) #For _ggo.h includes ENDFOREACH(GGO_FILE) + SET_SOURCE_FILES_PROPERTIES(${${GGO_SRCS}} PROPERTIES GENERATED TRUE) ENDMACRO (WRAP_GGO) # Reproduce old mechanism with new macro for ggo files (for the time being) FILE(GLOB ALL_GGO_FILES *.ggo) -WRAP_GGO(ALL_GGO_SRCS ${ALL_GGO_FILES}) +#WRAP_GGO(ALL_GGO_SRCS ${ALL_GGO_FILES}) #========================================================= #Set a reasonable build mode default if the user hasn't set any if (NOT CMAKE_BUILD_TYPE) @@ -43,5 +43,7 @@ SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lib) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/common) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/tools) -INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/filters) #For _ggo.h includes from other directories +INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/tools) #For _ggo.h includes from other directories +INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/segmentation) #For _ggo.h includes from other directories +INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/registration) #For _ggo.h includes from other directories #=========================================================