BUG

[bbtk.git] / kernel / cmake / BBTKConfigurePackage.cmake

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index b4d4869cbc8d519d0a4ce1f0405264e7e945465c..56d31f048b65167b3baed55510aeb846339b8d34 100644 (file)
--- 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)
 #-----------------------------------------------------------------------------
   
 #-----------------------------------------------------------------------------
@@ -107,11 +109,11 @@ IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})
       #      )
     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)
+      ENDIF(NOT BBTK_BUILT_WITH_WX)
     ENDIF(BBTK_CORE_PACKAGE)
   ENDIF(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS)