improvements to the build process:

[clitk.git] / cmake / common.cmake

diff --git a/cmake/common.cmake b/cmake/common.cmake
index f4babb8ec3e1ab40c9111994db4e16c9f041bf7b..eeb8755cf51f6455438dcd820478624f742ab58d 100644 (file)
--- 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)
@@ -17,6 +16,7 @@ MACRO (WRAP_GGO GGO_SRCS)
                            ARGS < ${GGO_FILE_ABS}
                                   --output-dir=${CMAKE_CURRENT_BINARY_DIR}
                                   --arg-struct-name=args_info_${GGO_BASEFILENAME}
+                                  --func-name=cmdline_parser_${GGO_BASEFILENAME}
                                   --file-name=${GGO_BASEFILENAME}_ggo
                                   --unamed-opts
                                   --conf-parser
@@ -26,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)
@@ -42,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
 #=========================================================