X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage_src.cmake;h=b16e0fa541fd9504d6effec7289cc59d979f598a;hb=7046e89dffa70376e47bde09081e691d74fbe580;hp=26babc9c76a7fb30afc925f256ec998246e8c0bf;hpb=9ebbefccfab8978b357669af56a08d661386df9a;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index 26babc9..b16e0fa 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} 
+  )
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
@@ -44,6 +49,8 @@ SET_SOURCE_FILES_PROPERTIES(
 #----------------------------------------------------------------------------
 IF(${BBTK_PACKAGE_NAME}_COMPILE_ALL_CXX) 
   FILE(GLOB ${BBTK_PACKAGE_NAME}_CXX_SOURCES "." "*.cxx")
+  FILE(GLOB ${BBTK_PACKAGE_NAME}_CPP_SOURCES "." "*.cpp")
+  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})
@@ -72,13 +79,14 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES})
   SET(BBFY_CXX_OUT ${CMAKE_CURRENT_BINARY_DIR}/${filename}.cxx)
   
   IF (WIN32)
-    SET(command00 Path=%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH%)
-    STRING(REPLACE "__RR__" "\;" SETPATH ${command00} )
-	#    SET(SETPATH set ${command0} &&)
+    MAKE_DLL_PATH()
+ #   SET(command00 Path=c:/creatis/dlls__RR__%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH%)
+ #   STRING(REPLACE "__RR__" "\;" SETPATH ${command00} )
+ #   SET(SETPATH set ${command0} &&)
  ADD_CUSTOM_COMMAND(
     OUTPUT ${BBFY_CXX_OUT}
     COMMAND
-    set ${SETPATH} && ${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} 
     )
@@ -118,6 +126,22 @@ 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}
   )
@@ -125,7 +149,9 @@ TARGET_LINK_LIBRARIES(bb${BBTK_PACKAGE_NAME}
   bbtk
   ${${BBTK_PACKAGE_NAME}_LIBS}
   )
+IF(UNIX)
 SET_TARGET_PROPERTIES(bb${BBTK_PACKAGE_NAME} PROPERTIES COMPILE_FLAGS -Wall)
+ENDIF(UNIX)
 #----------------------------------------------------------------------------
 
 
@@ -138,9 +164,9 @@ 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})
@@ -155,17 +181,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 "")
@@ -191,9 +225,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})
 #-----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------