X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage_src.cmake;h=83ccbf838e30722d2eed3c7313b46057830ac48d;hb=ed9d32f344e2ffa223081390b63f064cf1e42de0;hp=494d9ffb60cdd13721e96c930aeaeddcd5ba5ee2;hpb=7785d9f3ee33f106ad64a204d8cef883185180b0;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index 494d9ff..83ccbf8 100644
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -8,8 +8,13 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} )
 #----------------------------------------------------------------------------
 
-
-
+#----------------------------------------------------------------------------
+# CREATES bb${BBTK_PACKAGE_NAME}_EXPORT.h
+CREA_DYNAMIC_LIBRARY_EXPORT(bb${BBTK_PACKAGE_NAME})
+INSTALL(
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/bb${BBTK_PACKAGE_NAME}_EXPORT.h
+  DESTINATION include/bb${BBTK_PACKAGE_NAME} 
+  )
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
@@ -48,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}
@@ -68,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)
@@ -81,7 +86,7 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES})
  ADD_CUSTOM_COMMAND(
     OUTPUT ${BBFY_CXX_OUT}
     COMMAND
-    set ${DLL_PATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
+    set Path=${DLL_PATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
     DEPENDS ${xmlfile}
     ${BBTK_BBFY_DEPENDENCY} 
     )
@@ -121,9 +126,27 @@ ENDFOREACH(xmlfile)
 
 #----------------------------------------------------------------------------
 # CREATES LIBRARY
+#----------------------------------------------------------------------------
+# TCL WRAPPING FOR KWWIDGETS
+IF(BBTK_USE_KWWIDGETS)
+#MESSAGE(STATUS "****TCL=${${BBTK_PACKAGE_NAME}_CXX_SOURCES_WRAP_TCL}")
+IF(${BBTK_PACKAGE_NAME}_CXX_SOURCES_WRAP_TCL )
+#MESSAGE(STATUS "****TCL OK")
+include("${KWWidgets_CMAKE_DIR}/KWWidgetsWrappingMacros.cmake")
+kwwidgets_wrap_tcl(bb${BBTK_PACKAGE_NAME} LIB_TCL_SRCS ${${BBTK_PACKAGE_NAME}_CXX_SOURCES_WRAP_TCL} "")
+SET(${BBTK_PACKAGE_NAME}_CXX_SOURCES 
+  ${${BBTK_PACKAGE_NAME}_CXX_SOURCES} 
+  ${LIB_TCL_SRCS})
+ENDIF(${BBTK_PACKAGE_NAME}_CXX_SOURCES_WRAP_TCL)
+ENDIF(BBTK_USE_KWWIDGETS)
+#----------------------------------------------------------------------------
+#MESSAGE(STATUS ${${BBTK_PACKAGE_NAME}_CXX_SOURCES})
+
 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}
@@ -143,9 +166,11 @@ INSTALL(
   )  
 INSTALL(
   TARGETS bb${BBTK_PACKAGE_NAME} 
-  DESTINATION lib)
+  DESTINATION ${BBTK_PACKAGE_LIB_PATH}
+  )
+
 
-# CreateFindPackage
+# Preparing macro invocation : CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE
 SET( LIBRARY_NAME bb${BBTK_PACKAGE_NAME} )
 # SET THE LIB VERSION
 SET(${LIBRARY_NAME}_MAJOR_VERSION ${${BBTK_PACKAGE_NAME}_MAJOR_VERSION})
@@ -160,17 +185,25 @@ 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 lib)
+SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${BBTK_PACKAGE_LIB_PATH})
 
 # REQUIRED BUILD FLAGS
 #SET(${LIBRARY_NAME}_REQUIRED_C_FLAGS "")
@@ -179,10 +212,12 @@ SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
 
 # 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})
@@ -196,9 +231,7 @@ SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
-# Includes CMakeCreateFindPackage
-INCLUDE(${CMakeCreateFindPackage_DIR}/CMakeCreateFindPackage.cmake)
-CMAKE_CREATE_FIND_PACKAGE(${LIBRARY_NAME})
+CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
 #-----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------