BUG - Problem when crea::std2wx is not used. Problem corrected

[bbtkGEditor.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 283d192fc7754740e7c07b6d0d3a0b43acb26475..4d7da4f2aa6a205e386838b0cbb021935b6ba6bb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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}")
@@ -37,24 +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_