v1.1.0 BUG: 1402

[bbtkGEditor.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fed56e695b6f73581f3efd4fc3a2b0964f976fd9..4d7da4f2aa6a205e386838b0cbb021935b6ba6bb 100644 (file)
--- 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/creatools/GettingStarted_creaTools
+# http://www.creatis.insa-lyon.fr/site/fr/CreatoosGettingStarted-v2.0.X
 # before starting.
 #
 # ---------------------------------
@@ -15,7 +15,7 @@ PROJECT( bbtkGEditor )
 #==================================
 # The project version
 SET(PROJECT_MAJOR_VERSION 1)
-SET(PROJECT_MINOR_VERSION 0)
+SET(PROJECT_MINOR_VERSION 1)
 SET(PROJECT_BUILD_VERSION 0)
 
 SET(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_BUILD_VERSION}")
@@ -25,6 +25,9 @@ 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)
@@ -34,27 +37,6 @@ 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
@@ -92,6 +74,26 @@ 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})
@@ -108,8 +110,7 @@ MARK_AS_ADVANCED(
   INCLUDE_DIRECTORIES(
     ${PROJECT_BINARY_DIR}
 
- # // if the previous one is not enough :  (JPRx)
- #   Add here the directories holding the .h you need
+ # USER! : Add here the directories holding the .h you need  
     
  #   ${PROJECT_SOURCE_DIR}/lib/_YOUR_OWN_LIBRARY_SOURCE_DIRECTORY_
  
@@ -129,10 +130,10 @@ SET(BBTK_DOC_BUILD_PATH
    )
 #==================================
 
-# Subdirs
-SUBDIRS(lib)
-SUBDIRS(appli)
-SUBDIRS(doc)
-SUBDIRS(data)
-SUBDIRS(install)
+# ADD_SUBDIRECTORY
+ADD_SUBDIRECTORY(lib)
+ADD_SUBDIRECTORY(appli)
+ADD_SUBDIRECTORY(doc)
+ADD_SUBDIRECTORY(data)
+ADD_SUBDIRECTORY(install)
 #==================================