From b6f42788df27ba78ec951c9a9b2a11d74c6c7c5e Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Wed, 15 Oct 2008 11:34:43 +0000 Subject: [PATCH] *** empty log message *** --- kernel/cmake/BBTKConfigurePackagePaths.cmake | 3 +- kernel/cmake/BBTKConfigurePackage_src.cmake | 6 +-- kernel/cmake/BBTKCreatePackageBBdoc.cmake | 18 +++++++- .../BBTKCreatePackageIncludeScript.cmake | 43 +++++++++++++++++-- kernel/cmake/BBTKKernelConfig.cmake | 3 ++ kernel/doc/bbtkWebSite/CMakeLists.txt | 18 ++++---- kernel/install/cpack/CMakeLists.txt | 2 +- kernel/src/CMakeLists.txt | 7 +-- 8 files changed, 77 insertions(+), 23 deletions(-) diff --git a/kernel/cmake/BBTKConfigurePackagePaths.cmake b/kernel/cmake/BBTKConfigurePackagePaths.cmake index 2a87606..f276419 100644 --- a/kernel/cmake/BBTKConfigurePackagePaths.cmake +++ b/kernel/cmake/BBTKConfigurePackagePaths.cmake @@ -12,7 +12,7 @@ IF(WIN32) MESSAGE(FATAL_ERROR "bbi not found in ${BBTK_DIR}/bin ; ${BBTK_DIR}/Release ; ${BBTK_DIR}/Debug : is bbtk properly built ?") ENDIF(NOT BBTK_BIN_PATH) - + SET(BBTK_PACKAGE_LIB_PATH bin) SET(BBTK_BBI "${BBTK_BIN_PATH}/bbi") SET(BBTK_BBS2CPP "${BBTK_BIN_PATH}/bbs2cpp") SET(BBTK_BBC "${BBTK_BIN_PATH}/bbc") @@ -23,6 +23,7 @@ ELSE(WIN32) # SET (EXECUTABLE_OUTPUT_REL_PATH bin) # SET (LIBRARY_OUTPUT_REL_PATH bin) SET(BBTK_BIN_PATH ${BBTK_INSTALL_PREFIX}/bin) + SET(BBTK_PACKAGE_LIB_PATH ${BBTK_INSTALL_PREFIX}/lib) SET(BBTK_BBI "${BBTK_BIN_PATH}/bbi") SET(BBTK_BBS2CPP "${BBTK_BIN_PATH}/bbs2cpp") SET(BBTK_BBC "${BBTK_BIN_PATH}/bbc") diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake index 494d9ff..58583e3 100644 --- a/kernel/cmake/BBTKConfigurePackage_src.cmake +++ b/kernel/cmake/BBTKConfigurePackage_src.cmake @@ -81,7 +81,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} ) @@ -143,7 +143,7 @@ INSTALL( ) INSTALL( TARGETS bb${BBTK_PACKAGE_NAME} - DESTINATION lib) + DESTINATION ${BBTK_PACKAGE_LIB_PATH}) # CreateFindPackage SET( LIBRARY_NAME bb${BBTK_PACKAGE_NAME} ) @@ -170,7 +170,7 @@ ELSE(UNIX) 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 "") diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake index b614587..c28e577 100644 --- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake +++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake @@ -22,10 +22,17 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME) "graph ${PACKAGE_NAME} 0 0 ${DOC_OUTPUT} \"${BBTK_BBDOC_BUILD_PATH}/${BBTK_PACKAGE_NAME}/header.html\" \"Package ${PACKAGE_NAME} documentation\"\n" ) + IF(WIN32) + INSTALL( + FILES ${OUTPUT_FILE} + DESTINATION ${BBTK_BBS_REL_PATH}/${BBTK_PACKAGE_NAME}/appli + ) + ELSE(WIN32) INSTALL( FILES ${OUTPUT_FILE} DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/appli ) + ENDIF(WIN32) # @@ -64,11 +71,20 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME) DEPENDS ${DOC_OUTPUT} ) + IF(WIN32) INSTALL( DIRECTORY ${BBTK_BBDOC_BUILD_PATH}/${PACKAGE_NAME} DESTINATION ${BBTK_BBDOC_INSTALL_PATH} + #DESTINATION ${BBTK_BBDOC_REL_PATH} ) - + ELSE(WIN32) + INSTALL( + DIRECTORY ${BBTK_BBDOC_BUILD_PATH}/${PACKAGE_NAME} + #DESTINATION ${BBTK_BBDOC_INSTALL_PATH} + DESTINATION ${BBTK_BBDOC_REL_PATH} + ) + ENDIF(WIN32) + IF(NOT WIN32) # runs bbtk-make-index as a post install step # does not work on windaube diff --git a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake index 7b07e2f..b9a737c 100644 --- a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake +++ b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake @@ -35,11 +35,21 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT BBTK_PACKAGE_NAME BBTK_PACKAGE_BB COPYONLY ) GET_FILENAME_COMPONENT(bbs_path ${bbs} PATH) + + + IF(WIN32) INSTALL( FILES ${CMAKE_CURRENT_SOURCE_DIR}/${bbs} +# DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path} + DESTINATION ${BBTK_BBS_REL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path} + ) +ELSE(WIN32) +INSTALL( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/${bbs} DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path} +# DESTINATION ${BBTK_BBS_REL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path} ) - +ENDIF(WIN32) ENDFOREACH(bbs) FILE(APPEND "${OUTPUT_FILE}" @@ -47,11 +57,19 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT BBTK_PACKAGE_NAME BBTK_PACKAGE_BB "endpackage\n" "#-- EOF ----------------------------------\n" ) + IF(WIN32) + INSTALL( + FILES ${OUTPUT_FILE} +# DESTINATION ${BBTK_BBS_INSTALL_PATH} + DESTINATION ${BBTK_BBS_REL_PATH} + ) +ELSE(WIN32) INSTALL( FILES ${OUTPUT_FILE} DESTINATION ${BBTK_BBS_INSTALL_PATH} +# DESTINATION ${BBTK_BBS_REL_PATH} ) - +ENDIF(WIN32) # Creates the file ${BBTK_PACKAGE_NAME}-appli.bbp SET(OUTPUT_FILE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}-appli.bbp) FILE(WRITE @@ -81,10 +99,21 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT BBTK_PACKAGE_NAME BBTK_PACKAGE_BB COPYONLY ) GET_FILENAME_COMPONENT(bbs_path ${bbs} PATH) + + + IF(WIN32) + INSTALL( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/${bbs} + # DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path} + DESTINATION ${BBTK_BBS_REL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path} + ) +ELSE(WIN32) INSTALL( FILES ${CMAKE_CURRENT_SOURCE_DIR}/${bbs} DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path} + # DESTINATION ${BBTK_BBS_REL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path} ) +ENDIF(WIN32) ENDFOREACH(bbs) FILE(APPEND "${OUTPUT_FILE}" @@ -92,11 +121,19 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT BBTK_PACKAGE_NAME BBTK_PACKAGE_BB "endpackage\n" "#-- EOF ----------------------------------\n" ) +IF(WIN32) + INSTALL( + FILES ${OUTPUT_FILE} + # DESTINATION ${BBTK_BBS_INSTALL_PATH} + DESTINATION ${BBTK_BBS_REL_PATH} + ) +ELSE(WIN32) INSTALL( FILES ${OUTPUT_FILE} DESTINATION ${BBTK_BBS_INSTALL_PATH} + # DESTINATION ${BBTK_BBS_REL_PATH} ) - +ENDIF(WIN32) # ADD_CUSTOM_TARGET(${BBTK_PACKAGE_NAME}.bbp ALL # DEPENDS ${OUTPUT_FILE} # ) diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake index 27149d4..fa73ded 100644 --- a/kernel/cmake/BBTKKernelConfig.cmake +++ b/kernel/cmake/BBTKKernelConfig.cmake @@ -49,12 +49,14 @@ IF(WIN32) ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 6") SET(BBTK_BIN_PATH $(SolutionDir)/$(OutDir)) ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 6") + SET(BBTK_LIB_PATH bin) SET(BBTK_BBS2CPP ${BBTK_BIN_PATH}/bbs2cpp.exe) SET(BBTK_BBC ${BBTK_BIN_PATH}/bbc.exe) SET(BBTK_BBI ${BBTK_BIN_PATH}/bbi.exe) SET(BBTK_BBFY ${BBTK_BIN_PATH}/bbfy.exe) SET(BBTK_BBDOC ${BBTK_BIN_PATH}/bbdoc.exe) ELSE(WIN32) + SET(BBTK_LIB_PATH lib) SET(BBTK_BIN_PATH ${EXECUTABLE_OUTPUT_PATH}) SET(BBTK_BBI ${BBTK_BIN_PATH}/bbi) SET(BBTK_BBS2CPP ${BBTK_BIN_PATH}/bbs2cpp) @@ -62,6 +64,7 @@ ELSE(WIN32) SET(BBTK_BBFY ${BBTK_BIN_PATH}/bbfy) SET(BBTK_BBDOC ${BBTK_BIN_PATH}/bbdoc) ENDIF(WIN32) +SET(BBTK_PACKAGE_LIB_PATH ${BBTK_LIB_PATH}) #----------------------------------------------------------------------------- diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt index c14da9f..b57ae4d 100644 --- a/kernel/doc/bbtkWebSite/CMakeLists.txt +++ b/kernel/doc/bbtkWebSite/CMakeLists.txt @@ -24,15 +24,15 @@ IF (WIN32) SET(USE_DOT TRUE) MAKE_DLL_PATH() - - ADD_CUSTOM_COMMAND( - OUTPUT ${INDEX_OUTPUT} - COMMAND - set ${DLL_PATH} cd ${BBTK_BIN_PATH} && ./bbRegeneratePackageDoc -a -q && ./bbRegenerateBoxesLists -q - - DEPENDS ${BBTK_PACKAGES_DEPS} bbRegeneratePackageDoc bbRegenerateBoxesLists - ) - + + ADD_CUSTOM_COMMAND( + OUTPUT ${INDEX_OUTPUT} + COMMAND + set Path=${DLL_PATH} && cd ${BBTK_BIN_PATH} && bbRegeneratePackageDoc -a && bbRegenerateBoxesLists + + DEPENDS ${BBTK_PACKAGES_DEPS} + ) + ELSE (WIN32) # MESSAGE(STATUS "PACKAGE_DEPS=${BBTK_PACKAGES_DEPS}") diff --git a/kernel/install/cpack/CMakeLists.txt b/kernel/install/cpack/CMakeLists.txt index f2bff27..27bd6f7 100644 --- a/kernel/install/cpack/CMakeLists.txt +++ b/kernel/install/cpack/CMakeLists.txt @@ -66,7 +66,7 @@ IF(BBTK_STANDALONE_INSTALLER) ENDIF(USE_VTK) IF(USE_ITK) - INSTALL( FILES ${ITK_DIR}/bin/ITKCommon.dll DESTINATION bin/ ) + INSTALL( FILES ${ITK_DIR}/../../bin/ITKCommon.dll DESTINATION bin/ ) ENDIF(USE_ITK) IF(USE_WXWIDGETS) diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt index ec3c604..2543518 100644 --- a/kernel/src/CMakeLists.txt +++ b/kernel/src/CMakeLists.txt @@ -208,10 +208,7 @@ ENDIF(UNIX) #----------------------------------------------------------------------------- FILE(GLOB BBTK_HEADERS "*.h") INSTALL(FILES ${BBTK_HEADERS} DESTINATION include/bbtk) -INSTALL(TARGETS bbtk DESTINATION lib) -IF(WIN32) - INSTALL(TARGETS bbtk DESTINATION bin/) -ENDIF(WIN32) +INSTALL(TARGETS bbtk DESTINATION ${BBTK_LIB_PATH}) #----------------------------------------------------------------------------- #----------------------------------------------------------------------------- @@ -241,7 +238,7 @@ ELSE(UNIX) ${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 lib) +SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${BBTK_LIB_PATH}) # OPTIONAL # - Set the version of your library -- 2.45.1