X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage.cmake;h=406b17f70870cc80d349e2e06ad52400fa2b9aa2;hb=b60f4996d8155665b79e20f85999f287bf1d73d3;hp=e529b0aca57f79de4bdc982d5ca082204d0de7e2;hpb=01f46ce7ba8fe9067dff0688706986475aaec73e;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index e529b0a..406b17f 100644
--- a/kernel/cmake/BBTKConfigurePackage.cmake
+++ b/kernel/cmake/BBTKConfigurePackage.cmake
@@ -1,3 +1,4 @@
+
 #---------------------------------------------------------------------------
 # If not a core package must include necessary cmake scripts
 IF(NOT BBTK_CORE_PACKAGE)
@@ -13,6 +14,11 @@ IF(NOT BBTK_CORE_PACKAGE)
 ENDIF(NOT BBTK_CORE_PACKAGE)
 #---------------------------------------------------------------------------
 
+#----------------------------------------------------------------------------
+# USER DEFINED ADDITIONAL INCLUDE DIRS
+INCLUDE_DIRECTORIES(${${BBTK_PACKAGE_NAME}_INCLUDE_DIRS})
+#----------------------------------------------------------------------------
+
 
 #-----------------------------------------------------------------------------
 SET(${BBTK_PACKAGE_NAME}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
@@ -22,7 +28,9 @@ SET(${BBTK_PACKAGE_NAME}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 # DOES THE USER WANT TO BUILD THE PACKAGE ?
 OPTION(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME} 
   "Build the bbtk package ${BBTK_PACKAGE_NAME} ?" OFF)
-SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})
+IF(NOT ${BBTK_PACKAGE_NAME}_EXCLUDE_FROM_BUILD_ALL)
+ SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})
+ENDIF(NOT ${BBTK_PACKAGE_NAME}_EXCLUDE_FROM_BUILD_ALL)
 #-----------------------------------------------------------------------------
   
 #-----------------------------------------------------------------------------
@@ -58,7 +66,7 @@ IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})
   IF(NOT ${BBTK_PACKAGE_NAME}_IN_DEPS)
     SET(BBTK_PACKAGES_DEPS "${${BBTK_PACKAGE_NAME}_DEPS};${BBTK_PACKAGES_DEPS}"
       CACHE INTERNAL "bbtk packages dependencies" FORCE)
-MESSAGE(STATUS "deps=${BBTK_PACKAGES_DEPS}")
+ #   MESSAGE(STATUS "Packages=${BBTK_PACKAGES_DEPS}")
   ENDIF(NOT ${BBTK_PACKAGE_NAME}_IN_DEPS)
   #---------------------------------------------------------------------------
 
@@ -101,17 +109,26 @@ MESSAGE(STATUS "deps=${BBTK_PACKAGES_DEPS}")
       SET(BBTK_USE_WXWIDGETS ON CACHE BOOL "Use wxWidgets" FORCE)
       MESSAGE(STATUS "BBTK_USE_WXWIDGETS forced to ON by the compilation of the package ${BBTK_PACKAGE_NAME}")
       # bbtk already links against wx ...
-      #    SET(${BBTK_PACKAGE_NAME}_LIBS
-      #      ${${BBTK_PACKAGE_NAME}_LIBS}
-      #      ${BBTK_WXWIDGETS_LIBRARIES}
-      #      )
+      IF(WIN32)
+          SET(${BBTK_PACKAGE_NAME}_LIBS
+            ${${BBTK_PACKAGE_NAME}_LIBS}
+            ${BBTK_WXWIDGETS_LIBRARIES}
+            )
+       ENDIF(WIN32)
     ELSE(BBTK_CORE_PACKAGE)
       # If linking against a non-wx bbtk : problem
-      IF(NOT BBTK_USE_WXWIDGETS)
+      IF(NOT BBTK_BUILT_WITH_WX)
 	MESSAGE(FATAL_ERROR "The bbtk package ${BBTK_PACKAGE_NAME} needs wxWidgets however the bbtk library which was found on your system was not compiled with wxWidgets : recompile it and rebuild the package.")
-      ELSE(NOT BBTK_USE_WXWIDGETS)
+      ELSE(NOT BBTK_BUILT_WITH_WX)
 	SET(USE_WXWIDGETS ON CACHE BOOL "Use wxWidgets" FORCE)
-      ENDIF(NOT BBTK_USE_WXWIDGETS)
+# bbtk already links against wx ...
+      IF(WIN32)
+          SET(${BBTK_PACKAGE_NAME}_LIBS
+            ${${BBTK_PACKAGE_NAME}_LIBS}
+            ${BBTK_WXWIDGETS_LIBRARIES}
+            )
+       ENDIF(WIN32)
+      ENDIF(NOT BBTK_BUILT_WITH_WX)
     ENDIF(BBTK_CORE_PACKAGE)
   ENDIF(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS)
 
@@ -125,21 +142,24 @@ MESSAGE(STATUS "deps=${BBTK_PACKAGES_DEPS}")
   SUBDIRS(src)
   SUBDIRS(doc)
   SUBDIRS(bbs)
-#---------------------------------------------------------------------------
+  SUBDIRS(data)
+  #---------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------
 ELSE(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})
   #-------------------------------------------------------------------------
   
   #-----------------------------------------------------------------------
-  # If package deps in global deps : remove them
+  # If package deps in global deps : reset global deps
   IF(${BBTK_PACKAGE_NAME}_IN_DEPS)
-    STRING(REPLACE "${${BBTK_PACKAGE_NAME}_DEPS};"
-      "" TEMP
-      ${BBTK_PACKAGES_DEPS})
-    
-    SET(BBTK_PACKAGES_DEPS ${TEMP}
-      CACHE INTERNAL "bbtk packages dependencies" FORCE)
+    SET(BBTK_PACKAGES_DEPS "" CACHE INTERNAL 
+      "bbtk packages dependencies" FORCE)
+#    STRING(REPLACE "${${BBTK_PACKAGE_NAME}_DEPS};"
+#      "" TEMP
+#      ${BBTK_PACKAGES_DEPS})
+#    
+#    SET(BBTK_PACKAGES_DEPS ${TEMP}
+#      CACHE INTERNAL "bbtk packages dependencies" FORCE)
   ENDIF(${BBTK_PACKAGE_NAME}_IN_DEPS)
   #-----------------------------------------------------------------------