X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKKernelConfig.cmake;h=86476e55f27a6c93630cedf7e6da3f63a8a75d3d;hb=6c8a2137ff5c30872ea69ba70284818d288892a7;hp=cfb63e7dba28a54b8d2ed64d94575bb114067d8b;hpb=a86e449e78ba07cd05cb267efea47eef2c6ab51a;p=bbtk.git diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake index cfb63e7..86476e5 100644 --- a/kernel/cmake/BBTKKernelConfig.cmake +++ b/kernel/cmake/BBTKKernelConfig.cmake @@ -15,8 +15,14 @@ SET(BBTK_CORE_PACKAGE TRUE) #----------------------------------------------------------------------------- # Path for binaries -SET (EXECUTABLE_OUTPUT_REL_PATH bin) -SET (LIBRARY_OUTPUT_REL_PATH bin) +IF(WIN32) + SET (EXECUTABLE_OUTPUT_REL_PATH "") + SET (LIBRARY_OUTPUT_REL_PATH "") +ELSE(WIN32) + SET (EXECUTABLE_OUTPUT_REL_PATH bin) + SET (LIBRARY_OUTPUT_REL_PATH bin) +ENDIF(WIN32) + SET (EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/${EXECUTABLE_OUTPUT_REL_PATH}) SET (LIBRARY_OUTPUT_PATH @@ -37,7 +43,7 @@ IF(WIN32) IF(CMAKE_GENERATOR STREQUAL "Visual Studio 6") SET(BBTK_BIN_PATH ${EXECUTABLE_OUTPUT_PATH}/$(IntDir)) ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 6") - SET(BBTK_BIN_PATH $(SolutionDir)/bin/$(OutDir)) + SET(BBTK_BIN_PATH $(SolutionDir)/$(OutDir)) ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 6") SET(BBTK_BBI ${BBTK_BIN_PATH}/bbi.exe) SET(BBTK_BBFY ${BBTK_BIN_PATH}/bbfy.exe) @@ -57,16 +63,14 @@ ENDIF(WIN32) # from build tree root or install tree root # (different on win/lin) IF(WIN32) - SET(BBTK_SHARE_REL_PATH / ) + SET(BBTK_SHARE_REL_PATH " ") SET(BBTK_DOC_REL_PATH doc) SET(BBTK_BBS_REL_PATH bbs) - # SET(BBTK_RSC_REL_PATH rsc) SET(BBTK_DATA_REL_PATH data) ELSE(WIN32) SET(BBTK_SHARE_REL_PATH share/bbtk) SET(BBTK_DOC_REL_PATH share/bbtk/doc) SET(BBTK_BBS_REL_PATH share/bbtk/bbs) - # SET(BBTK_RSC_REL_PATH share/bbtk/rsc) SET(BBTK_DATA_REL_PATH share/bbtk/data) ENDIF(WIN32) #-----------------------------------------------------------------------------