X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage.cmake;h=e7ab6b113d2e365a4f2bbfa3488da0544a4b041f;hb=1fd0a4edc8f7e8d5444788662f59c4384a9aab93;hp=56d31f048b65167b3baed55510aeb846339b8d34;hpb=e907b78de5147fba07b804c0a6dc94281aae0224;p=bbtk.git diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake index 56d31f0..e7ab6b1 100644 --- a/kernel/cmake/BBTKConfigurePackage.cmake +++ b/kernel/cmake/BBTKConfigurePackage.cmake @@ -103,16 +103,25 @@ 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_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_BUILT_WITH_WX) SET(USE_WXWIDGETS ON CACHE BOOL "Use wxWidgets" FORCE) +# 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)