X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=fed56e695b6f73581f3efd4fc3a2b0964f976fd9;hb=a5299437956e8cc3de71aaefede487ae06f4294f;hp=0ca78e894d8c213732c5fa6ec64e66535e901972;hpb=775c8164b5f679027b8bbafa97c0e0110711909b;p=bbtkGEditor.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ca78e8..fed56e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # Unless you are an experimented cmake user,
 # have a look at :
-# http://www.creatis.insa-lyon.fr/site/fr/CreatoosGettingStarted-v2.0.X
+# http://www.creatis.insa-lyon.fr/creatools/GettingStarted_creaTools
 # before starting.
 #
 # ---------------------------------
@@ -25,9 +25,6 @@ SET(PROJECT_VERSION_DATE "30/09/2009")
 
 #==================================
 
-# JPR 4 mars 2011
-set (CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Module)
-
 #==================================
 # Find crea (mandatory, to use macros)
 SET(CREA_VERBOSE_CMAKE TRUE)
@@ -37,6 +34,27 @@ IF (crea_FOUND)
 ENDIF(crea_FOUND)
 #==================================
 
+#==================================
+FIND_PACKAGE(creaMaracasVisu REQUIRED)
+IF (creaMaracasVisu_FOUND)
+  INCLUDE(${creaMaracasVisu_USE_FILE})
+ENDIF(creaMaracasVisu_FOUND)
+#==================================
+
+
+#==================================
+# Find and use the Black Box Toolkit
+# Search BBTK
+FIND_PACKAGE(BBTK REQUIRED)
+MARK_AS_ADVANCED(BBTK_DIR)
+# If bbtk found
+IF(BBTK_FOUND)
+  INCLUDE(${BBTK_USE_FILE})
+ENDIF(BBTK_FOUND)
+#==================================
+
+
+
 
 #==================================
 # Do not allow to build inside the source tree
@@ -74,26 +92,6 @@ SET(USE_BOOST     ON)
 CREA_FIND_AND_USE_LIBRARIES()
 #==================================
 
-
-#==================================
-FIND_PACKAGE(creaMaracasVisu REQUIRED)
-IF (creaMaracasVisu_FOUND)
-  INCLUDE(${creaMaracasVisu_USE_FILE})
-ENDIF(creaMaracasVisu_FOUND)
-#==================================
-
-#==================================
-# Find and use the Black Box Toolkit
-# Search BBTK
-FIND_PACKAGE(BBTK REQUIRED)
-MARK_AS_ADVANCED(BBTK_DIR)
-# If bbtk found
-IF(BBTK_FOUND)
-  INCLUDE(${BBTK_USE_FILE})
-ENDIF(BBTK_FOUND)
-#==================================
-
-
 #==================================
 # Where to put executables and libs
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
@@ -110,7 +108,8 @@ MARK_AS_ADVANCED(
   INCLUDE_DIRECTORIES(
     ${PROJECT_BINARY_DIR}
 
- # USER! : Add here the directories holding the .h you need  
+ # // if the previous one is not enough :  (JPRx)
+ #   Add here the directories holding the .h you need
     
  #   ${PROJECT_SOURCE_DIR}/lib/_YOUR_OWN_LIBRARY_SOURCE_DIRECTORY_
  
@@ -130,10 +129,10 @@ SET(BBTK_DOC_BUILD_PATH
    )
 #==================================
 
-# ADD_SUBDIRECTORY
-ADD_SUBDIRECTORY(lib)
-ADD_SUBDIRECTORY(appli)
-ADD_SUBDIRECTORY(doc)
-ADD_SUBDIRECTORY(data)
-ADD_SUBDIRECTORY(install)
+# Subdirs
+SUBDIRS(lib)
+SUBDIRS(appli)
+SUBDIRS(doc)
+SUBDIRS(data)
+SUBDIRS(install)
 #==================================