From b9d4d6bc3c094176e2fefe44c87a2072eae2e401 Mon Sep 17 00:00:00 2001 From: guigues Date: Thu, 15 Jan 2009 09:42:23 +0000 Subject: [PATCH] *** empty log message *** --- kernel/cmake/BBTKConfigurePackage_src.cmake | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake index d88f50e..b16e0fa 100644 --- a/kernel/cmake/BBTKConfigurePackage_src.cmake +++ b/kernel/cmake/BBTKConfigurePackage_src.cmake @@ -181,14 +181,22 @@ 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 ${BBTK_PACKAGE_LIB_PATH}) -- 2.45.1