X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage_src.cmake;h=83ccbf838e30722d2eed3c7313b46057830ac48d;hb=92777ab6b0fdbab3ca7d2ffda2e87d6270869ded;hp=f7363645a0e2f4971b6bfcb2a93204851954928c;hpb=038dbbd7dd8b34107ec932a34170a4625368eb25;p=bbtk.git diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake index f736364..83ccbf8 100644 --- a/kernel/cmake/BBTKConfigurePackage_src.cmake +++ b/kernel/cmake/BBTKConfigurePackage_src.cmake @@ -74,7 +74,6 @@ IF(${BBTK_PACKAGE_NAME}_COMPILE_ALL_XML) ENDIF(${BBTK_PACKAGE_NAME}_COMPILE_ALL_XML) #---------------------------------------------------------------------------- FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES}) - GET_FILENAME_COMPONENT(filename "${xmlfile}" NAME_WE) SET(BBFY_CXX_OUT ${CMAKE_CURRENT_BINARY_DIR}/${filename}.cxx) @@ -146,6 +145,8 @@ ENDIF(BBTK_USE_KWWIDGETS) ADD_LIBRARY(bb${BBTK_PACKAGE_NAME} SHARED ${${BBTK_PACKAGE_NAME}_CXX_SOURCES} ${${BBTK_PACKAGE_NAME}_H_SOURCES} ) + + TARGET_LINK_LIBRARIES(bb${BBTK_PACKAGE_NAME} bbtk ${${BBTK_PACKAGE_NAME}_LIBS} @@ -165,7 +166,9 @@ INSTALL( ) INSTALL( TARGETS bb${BBTK_PACKAGE_NAME} - DESTINATION ${BBTK_PACKAGE_LIB_PATH}) + DESTINATION ${BBTK_PACKAGE_LIB_PATH} + ) + # Preparing macro invocation : CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE SET( LIBRARY_NAME bb${BBTK_PACKAGE_NAME} ) @@ -209,11 +212,12 @@ SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${BBTK_PACKAGE_LIB_PATH} # Additional config/use # Prepare for configure -SET(BBTK_PACKAGE_USE_VTK ${${BBTK_PACKAGE_NAME}_USE_VTK}) -SET(BBTK_PACKAGE_USE_ITK ${${BBTK_PACKAGE_NAME}_USE_ITK}) -SET(BBTK_PACKAGE_USE_QT ${${BBTK_PACKAGE_NAME}_USE_QT}) -SET(BBTK_PACKAGE_USE_GDCM ${${BBTK_PACKAGE_NAME}_USE_GDCM}) -SET(BBTK_PACKAGE_USE_GSMIS ${${BBTK_PACKAGE_NAME}_USE_GSMIS}) +SET(BBTK_PACKAGE_USE_VTK ${${BBTK_PACKAGE_NAME}_USE_VTK}) +SET(BBTK_PACKAGE_USE_ITK ${${BBTK_PACKAGE_NAME}_USE_ITK}) +SET(BBTK_PACKAGE_USE_QT ${${BBTK_PACKAGE_NAME}_USE_QT}) +SET(BBTK_PACKAGE_USE_GDCM ${${BBTK_PACKAGE_NAME}_USE_GDCM}) +SET(BBTK_PACKAGE_USE_GDCM2 ${${BBTK_PACKAGE_NAME}_USE_GDCM2}) +SET(BBTK_PACKAGE_USE_GSMIS ${${BBTK_PACKAGE_NAME}_USE_GSMIS}) SET(BBTK_PACKAGE_USE_WXWIDGETS ${${BBTK_PACKAGE_NAME}_USE_WXWIDGETS}) SET(BBTK_PACKAGE_USE_PACKAGES ${${BBTK_PACKAGE_NAME}_USE_PACKAGES}) SET(BBTK_PACKAGE_INCLUDE_DIRS ${${BBTK_PACKAGE_NAME}_INCLUDE_DIRS})