X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage.cmake;h=e7ab6b113d2e365a4f2bbfa3488da0544a4b041f;hb=2593029cb1c4a272c6502cc9abc82f980d479739;hp=b4d4869cbc8d519d0a4ce1f0405264e7e945465c;hpb=1549130608fe5eaec31c965f16babae0795a4afd;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index b4d4869..e7ab6b1 100644
--- a/kernel/cmake/BBTKConfigurePackage.cmake
+++ b/kernel/cmake/BBTKConfigurePackage.cmake
@@ -22,7 +22,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)
 #-----------------------------------------------------------------------------
   
 #-----------------------------------------------------------------------------
@@ -101,17 +103,26 @@ IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})
       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)