X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FCMakeLists.txt;h=5c7ca31f3365f5051e8b031f0f2c7303f4132cd3;hb=e97caf8b03ac7cd466a36d68dda8b762d4f4a596;hp=ae04bd181c006c431d33eadbed3490b78fb50811;hpb=6182fd299a7c70520dd8af586e99797a34c441ef;p=bbtk.git diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt index ae04bd1..5c7ca31 100644 --- a/kernel/src/CMakeLists.txt +++ b/kernel/src/CMakeLists.txt @@ -129,11 +129,11 @@ FILE(GLOB SOURCES "." "*.cxx" "*.cpp") FILE(GLOB SOURCES_H "." "*.h" ) IF(BBTK_USE_KWWIDGETS) - IF(KWWIDGETS_FOUND) + IF(KWWidgets_FOUND) include("${KWWidgets_CMAKE_DIR}/KWWidgetsWrappingMacros.cmake") kwwidgets_wrap_tcl(bbtk LIB_TCL_SRCS "vtkKWBlackBoxDialog.cxx" "") SET(SOURCES ${SOURCES} ${LIB_TCL_SRCS}) - ENDIF(KWWIDGETS_FOUND) + ENDIF(KWWidgets_FOUND) ENDIF(BBTK_USE_KWWIDGETS) #----------------------------------------------------------------------------- @@ -199,9 +199,12 @@ IF(UNIX) SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS ${EXECUTABLE_OUTPUT_REL_PATH}) ELSE(UNIX) - SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS - ${EXECUTABLE_OUTPUT_REL_PATH}/Debug - ${EXECUTABLE_OUTPUT_REL_PATH}/Release) + SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS + ${EXECUTABLE_OUTPUT_REL_PATH} + . + ) + #${EXECUTABLE_OUTPUT_REL_PATH})/Debug + #${EXECUTABLE_OUTPUT_REL_PATH}/Release) ENDIF(UNIX) SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/bbtk include/bbtk/ThirdParty) SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${BBTK_LIB_PATH})