X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage_src.cmake;h=83ccbf838e30722d2eed3c7313b46057830ac48d;hb=284c682653a60e969e2cff74445702fe54c32a76;hp=d88f50eb411626cb4ebb523488c6cc7a65800d84;hpb=6182fd299a7c70520dd8af586e99797a34c441ef;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index d88f50e..83ccbf8 100644
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -53,6 +53,7 @@ IF(${BBTK_PACKAGE_NAME}_COMPILE_ALL_CXX)
   SET(${BBTK_PACKAGE_NAME}_CXX_SOURCES ${${BBTK_PACKAGE_NAME}_CXX_SOURCES} ${${BBTK_PACKAGE_NAME}_CPP_SOURCES})
   FILE(GLOB ${BBTK_PACKAGE_NAME}_H_SOURCES "." "*.h")
 ENDIF(${BBTK_PACKAGE_NAME}_COMPILE_ALL_CXX) 
+
 IF(NOT PROJECT_BINARY_DIR STREQUAL ${PROJECT_SOURCE_DIR})
   SET(${BBTK_PACKAGE_NAME}_CXX_SOURCES
     ${${BBTK_PACKAGE_NAME}_CXX_SOURCES}
@@ -73,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)
@@ -145,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}
@@ -164,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} )
@@ -181,14 +185,22 @@ FILE(RELATIVE_PATH
   ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
   )
 
+IF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
+  SET(CILFC_EXECUTABLE_OUTPUT_REL_PATH ".")
+ELSE ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
+  FILE(RELATIVE_PATH 
+    CILFC_EXECUTABLE_OUTPUT_REL_PATH
+    ${PROJECT_BINARY_DIR} ${EXECUTABLE_OUTPUT_PATH})
+ENDIF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
+
 IF(UNIX)
-  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
-    ${EXECUTABLE_OUTPUT_REL_PATH})
+  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS
+    ${CILFC_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
+    ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
 ENDIF(UNIX)
+
 SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS 
   include/bb${BBTK_PACKAGE_NAME})
 SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${BBTK_PACKAGE_LIB_PATH})
@@ -200,10 +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_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})