From e5bde2deb329f4284a00d589e14c68b3f3a9c677 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Mon, 28 Jan 2008 17:35:56 +0000 Subject: [PATCH] *** empty log message *** --- kernel/CMakeLists.txt | 26 +++++++++++++++++++++----- kernel/bbtk_config_build.xml.in | 4 ++-- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt index dfc9517..ace6307 100644 --- a/kernel/CMakeLists.txt +++ b/kernel/CMakeLists.txt @@ -19,9 +19,25 @@ ENDIF(BUILD_APPLICATIONS) #----------------------------------------------------------------------------- # bbtk_config.xml for the build tree -CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/bbtk_config_build.xml.in - ${BBTK_BIN_PATH}/bbtk_config.xml - @ONLY IMMEDIATE - ) +#MESSAGE(ERROR "'${BBTK_BIN_PATH}'") +IF(UNIX) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/bbtk_config_build.xml.in + ${BBTK_BIN_PATH}/bbtk_config.xml + @ONLY IMMEDIATE + ) +ELSE(UNIX) + SET(BBTK_BIN_PATH_OUTPUT ${EXECUTABLE_OUTPUT_PATH}/Debug ) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/bbtk_config_build.xml.in + ${EXECUTABLE_OUTPUT_PATH}/Debug/bbtk_config.xml + @ONLY IMMEDIATE + ) + SET(BBTK_BIN_PATH_OUTPUT ${EXECUTABLE_OUTPUT_PATH}/Release ) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/bbtk_config_build.xml.in + ${EXECUTABLE_OUTPUT_PATH}/Release/bbtk_config.xml + @ONLY IMMEDIATE + ) +ENDIF(UNIX) #----------------------------------------------------------------------------- diff --git a/kernel/bbtk_config_build.xml.in b/kernel/bbtk_config_build.xml.in index 1ff142b..004d2a4 100644 --- a/kernel/bbtk_config_build.xml.in +++ b/kernel/bbtk_config_build.xml.in @@ -6,10 +6,10 @@ . @PROJECT_BINARY_DIR@/@BBTK_BBS_INSTALL_PATH@ - @BBTK_BIN_PATH@ + @BBTK_BIN_PATH_OUTPUT@ @BBTK_DATA_ROOT@ - . + @PROJECT_BINARY_DIR@/ -- 2.45.1