From db48111865cec77e52e711af91a220ccbe489960 Mon Sep 17 00:00:00 2001 From: guigues Date: Fri, 27 Jun 2008 12:13:23 +0000 Subject: [PATCH] *** empty log message *** --- kernel/cmake/BBTKConfigurePackagePaths.cmake | 17 ++++++++++------- kernel/cmake/BBTKCreatePackageBBdoc.cmake | 2 +- kernel/cmake/BBTKKernelConfig.cmake | 4 ++++ kernel/cmake/BBTKSetDeducedPaths.cmake | 10 +++++----- ...MakeCreateFindPackage_LibraryConfig.cmake.in | 2 ++ kernel/doc/bbtkWebSite/CMakeLists.txt | 5 +++++ kernel/doc/bbtkWebSite/bbtk-make-index.sh.in | 11 +++++------ 7 files changed, 32 insertions(+), 19 deletions(-) diff --git a/kernel/cmake/BBTKConfigurePackagePaths.cmake b/kernel/cmake/BBTKConfigurePackagePaths.cmake index 6a5c2a3..b9f4e01 100644 --- a/kernel/cmake/BBTKConfigurePackagePaths.cmake +++ b/kernel/cmake/BBTKConfigurePackagePaths.cmake @@ -1,6 +1,8 @@ # Use the installed appli IF(WIN32) + SET (EXECUTABLE_OUTPUT_REL_PATH "") + SET (LIBRARY_OUTPUT_REL_PATH "") FILE(TO_NATIVE_PATH ${PROJECT_BINARY_DIR}/$(OutDir) BBTK_BIN_PATH) # TO DO : use computed path for build/install tree SET(BBTK_BBI "${BBTK_DIR}/bin/bbi") @@ -10,13 +12,14 @@ IF(WIN32) SET(BBTK_BBDOC "${BBTK_DIR}/bin/bbdoc") ELSE(WIN32) - FILE(TO_NATIVE_PATH ${EXECUTABLE_OUTPUT_PATH} BBTK_BIN_PATH) - # TO DO : use computed path for build/install tree - SET(BBTK_BBI "${BBTK_DIR}/../../bin/bbi") - SET(BBTK_BBS2CPP "${BBTK_DIR}/../../bin/bbs2cpp") - SET(BBTK_BBC "${BBTK_DIR}/../../bin/bbc") - SET(BBTK_BBFY "${BBTK_DIR}/../../bin/bbfy") - SET(BBTK_BBDOC "${BBTK_DIR}/../../bin/bbdoc") +# SET (EXECUTABLE_OUTPUT_REL_PATH bin) +# SET (LIBRARY_OUTPUT_REL_PATH bin) + SET(BBTK_BIN_PATH ${BBTK_INSTALL_PREFIX}/bin) + SET(BBTK_BBI "${BBTK_BIN_PATH}/bbi") + SET(BBTK_BBS2CPP "${BBTK_BIN_PATH}/bbs2cpp") + SET(BBTK_BBC "${BBTK_BIN_PATH}/bbc") + SET(BBTK_BBFY "${BBTK_BIN_PATH}/bbfy") + SET(BBTK_BBDOC "${BBTK_BIN_PATH}/bbdoc") ENDIF(WIN32) diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake index c971745..be932d3 100644 --- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake +++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake @@ -68,7 +68,7 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME) # runs bbtk-make-index as a post install step IF(NOT BBTK_CORE_PACKAGE) - INSTALL(CODE "EXECUTE_PROCESS(COMMAND bbtk-make-index)") + INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${BBTK_BIN_PATH}/bbtk-make-index)") ENDIF(NOT BBTK_CORE_PACKAGE) diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake index 1b61364..316dc9d 100644 --- a/kernel/cmake/BBTKKernelConfig.cmake +++ b/kernel/cmake/BBTKKernelConfig.cmake @@ -61,6 +61,10 @@ ENDIF(WIN32) #----------------------------------------------------------------------------- +#----------------------------------------------------------------------------- +SET(BBTK_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) +#----------------------------------------------------------------------------- + #----------------------------------------------------------------------------- # The vars BBTK_DOC_REL_PATH and BBTK_BBS_REL_PATH # store documentation and scripts **RELATIVE** paths diff --git a/kernel/cmake/BBTKSetDeducedPaths.cmake b/kernel/cmake/BBTKSetDeducedPaths.cmake index c39d4c0..fae2ed8 100644 --- a/kernel/cmake/BBTKSetDeducedPaths.cmake +++ b/kernel/cmake/BBTKSetDeducedPaths.cmake @@ -10,11 +10,11 @@ SET(BBTK_DOXYGEN_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_DOXYGEN_REL_PATH}) SET(BBTK_BBS_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_BBS_REL_PATH}) SET(BBTK_DATA_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_DATA_REL_PATH}) -SET(BBTK_DOC_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_DOC_REL_PATH}) -SET(BBTK_BBDOC_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_BBDOC_REL_PATH}) -SET(BBTK_DOXYGEN_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_DOXYGEN_REL_PATH}) -SET(BBTK_BBS_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_BBS_REL_PATH}) -SET(BBTK_DATA_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_DATA_REL_PATH}) +SET(BBTK_DOC_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_DOC_REL_PATH}) +SET(BBTK_BBDOC_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_BBDOC_REL_PATH}) +SET(BBTK_DOXYGEN_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_DOXYGEN_REL_PATH}) +SET(BBTK_BBS_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_BBS_REL_PATH}) +SET(BBTK_DATA_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_DATA_REL_PATH}) # Create build directories if necessary MKDIR(${BBTK_DOC_BUILD_PATH}) diff --git a/kernel/cmake/CMakeCreateFindPackage_LibraryConfig.cmake.in b/kernel/cmake/CMakeCreateFindPackage_LibraryConfig.cmake.in index 265f7e1..d609ed6 100644 --- a/kernel/cmake/CMakeCreateFindPackage_LibraryConfig.cmake.in +++ b/kernel/cmake/CMakeCreateFindPackage_LibraryConfig.cmake.in @@ -76,6 +76,8 @@ FOREACH(path ${CFP_RELATIVE_LIBRARY_PATHS}) ) ENDFOREACH(path ${CFP_RELATIVE_LIBRARY_PATHS}) +# Set the "prefix path" +SET(@LIBRARY_NAME@_INSTALL_PREFIX ${CFP_LIBRARY_PATH_PREFIX}) # The C and C++ flags added by @LIBRARY_NAME@ to the cmake-configured flags. SET(@LIBRARY_NAME@_REQUIRED_C_FLAGS "@CFP_LIB_REQUIRED_C_FLAGS@") diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt index 7e9a8f5..66daead 100644 --- a/kernel/doc/bbtkWebSite/CMakeLists.txt +++ b/kernel/doc/bbtkWebSite/CMakeLists.txt @@ -79,6 +79,11 @@ CONFIGURE_FILE( ${BBTK_BBDOC_BUILD_PATH}/bbtk-make-index @ONLY ) +CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/bbtk-make-index.sh.in + ${BBTK_BIN_PATH}/bbtk-make-index + @ONLY + ) INSTALL( PROGRAMS ${BBTK_BBDOC_BUILD_PATH}/bbtk-make-index DESTINATION bin diff --git a/kernel/doc/bbtkWebSite/bbtk-make-index.sh.in b/kernel/doc/bbtkWebSite/bbtk-make-index.sh.in index 835627f..6028095 100755 --- a/kernel/doc/bbtkWebSite/bbtk-make-index.sh.in +++ b/kernel/doc/bbtkWebSite/bbtk-make-index.sh.in @@ -7,13 +7,12 @@ source ${HOME}/.bashrc echo "** Recreating bbtk doc index **" TMP=$(which $0|rev) -TMP2=$(echo ${TMP#*/}|rev) -DIR=${TMP2}/../@bbtk_install_gnome_DATA_REL_PATH@ +BIN=$(echo ${TMP#*/}|rev) -echo "> cd ${DIR}/@BBTK_BBDOC_REL_PATH@" -cd ${DIR}/@BBTK_BBDOC_REL_PATH@ +echo "> cd ${BIN}/../@BBTK_BBDOC_REL_PATH@" +cd ${BIN}/../@BBTK_BBDOC_REL_PATH@ -echo "> bbi -n ./make-index" -bbi -n ./make-index +echo "> ${BIN}/bbi ./make-index" +${BIN}/bbi ./make-index echo "** Done ! **" -- 2.45.1