X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2FCMakeLists.txt;h=c6f9aad3e8d5fbec96aa53c503dc0dcf8f4cbb55;hb=ed9d32f344e2ffa223081390b63f064cf1e42de0;hp=e3c70b7d34b52bb7a44e16a565d2c7957d791ef9;hpb=1319d088810125489e1ec75ee2226892d8dad708;p=bbtk.git

diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index e3c70b7..c6f9aad 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -1,43 +1,33 @@
+
 #-----------------------------------------------------------------------------
 # bbtk library 
-SUBDIRS(src)
+ADD_SUBDIRECTORY(src)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Documentation
-SUBDIRS(doc)
+ADD_SUBDIRECTORY(doc)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Applications (bbi, bbfy...)
-OPTION(BUILD_APPLICATIONS "Build Applications (bbi, bbfy, ...)" ON)
 IF(BUILD_APPLICATIONS)
-   SUBDIRS(appli)
+   ADD_SUBDIRECTORY(appli)
 ENDIF(BUILD_APPLICATIONS)
 #-----------------------------------------------------------------------------
 
+#-----------------------------------------------------------------------------
+# Recurse into cmake folder to install files
+ADD_SUBDIRECTORY(cmake)
+#-----------------------------------------------------------------------------
+
+
+#-----------------------------------------------------------------------------
+# System-specific installation tools
+ADD_SUBDIRECTORY(install)
+#-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
-# bbtk_config.xml for the build tree
-#MESSAGE(ERROR "'${BBTK_BIN_PATH}'")
-IF(UNIX)
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/bbtk_config_build.xml.in
-    ${EXECUTABLE_OUTPUT_PATH}/bbtk_config.xml
-    @ONLY IMMEDIATE
-   )
-ELSE(UNIX)
-  SET(BBTK_BIN_PATH_OUTPUT ${EXECUTABLE_OUTPUT_PATH}/Debug )  
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/bbtk_config_build.xml.in
-    ${EXECUTABLE_OUTPUT_PATH}/Debug/bbtk_config.xml
-    @ONLY IMMEDIATE
-   )
-  SET(BBTK_BIN_PATH_OUTPUT ${EXECUTABLE_OUTPUT_PATH}/Release )
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/bbtk_config_build.xml.in
-    ${EXECUTABLE_OUTPUT_PATH}/Release/bbtk_config.xml
-    @ONLY IMMEDIATE
-   )
-ENDIF(UNIX)
+ADD_SUBDIRECTORY(data)
 #-----------------------------------------------------------------------------
+ADD_SUBDIRECTORY(bin)
\ No newline at end of file