X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKKernelConfig.cmake;h=fa73dedbf3ca13a28d02df8f802948569a4c2a35;hb=1ae35ab233d889137ae2e0a347f55b960ab4b855;hp=e909c90f428f85f0840a5505b917912164c008dc;hpb=1cad1aa48a5353dc6844018dc8b756f876e17394;p=bbtk.git diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake index e909c90..fa73ded 100644 --- a/kernel/cmake/BBTKKernelConfig.cmake +++ b/kernel/cmake/BBTKKernelConfig.cmake @@ -6,6 +6,7 @@ INCLUDE_DIRECTORIES( ${PROJECT_BINARY_DIR}/kernel/src ) # SOURCES DIR MUST ALSO BE IN INCLUDE DIRS FOR FILES COMPILED IN BINARY DIR # WHICH NEED TO INCLUDE OTHER FILES OF THE PACKAGE INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/kernel/src ) +INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/kernel/src/ThirdParty ) #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- @@ -18,6 +19,7 @@ SET(BBTK_CORE_PACKAGE TRUE) IF(WIN32) SET (EXECUTABLE_OUTPUT_REL_PATH "") SET (LIBRARY_OUTPUT_REL_PATH "") + SET (ADDITIONAL_DLL_PATH "C:/CreaTools/lib" CACHE PATH "Additional paths in which to look for dlls") ELSE(WIN32) SET (EXECUTABLE_OUTPUT_REL_PATH bin) SET (LIBRARY_OUTPUT_REL_PATH bin) @@ -29,6 +31,9 @@ SET (LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/${LIBRARY_OUTPUT_REL_PATH}) #----------------------------------------------------------------------------- + + + #----------------------------------------------------------------------------- # The var BBTK_BIN_PATH # gives the system-dependent path to output binaries @@ -44,15 +49,22 @@ 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) + SET(BBTK_BBC ${BBTK_BIN_PATH}/bbc) SET(BBTK_BBFY ${BBTK_BIN_PATH}/bbfy) SET(BBTK_BBDOC ${BBTK_BIN_PATH}/bbdoc) ENDIF(WIN32) +SET(BBTK_PACKAGE_LIB_PATH ${BBTK_LIB_PATH}) #-----------------------------------------------------------------------------