*** empty log message ***

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

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index 3776cc0a2ff76d0d9521096c4921602b7933d909..406b17f70870cc80d349e2e06ad52400fa2b9aa2 100644 (file)
--- 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})
@@ -103,17 +109,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)