Mercurial > projects > qtd
changeset 240:8b1a982c9ac3
another fix for cmake
author | SokoL_SD |
---|---|
date | Mon, 20 Jul 2009 08:31:43 +0000 |
parents | 4716eaf4a67e |
children | e792a5287673 |
files | CMakeLists.txt |
diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Mon Jul 20 08:27:35 2009 +0000 +++ b/CMakeLists.txt Mon Jul 20 08:31:43 2009 +0000 @@ -127,7 +127,7 @@ ## Make commands. set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/build) add_custom_target(install - COMMAND cd ${CMAKE_BINARY_DIR}/CMakeFiles/build && ${make_util} install + COMMAND cd ${CMAKE_BINARY_DIR}/build && ${make_util} install COMMENT "" ) add_dependencies(install preinstall) @@ -162,7 +162,9 @@ else(NOT SECOND_RUN) PROJECT(qtd CXX C) -load_cache(${CMAKE_BINARY_DIR} INCLUDE_INTERNALS all_packages QTD_VERSION_STR QTD_VERSION) +if(NOT ${CMAKE_BINARY_DIR} STREQUAL ${CMAKE_SOURCE_DIR}) + load_cache(${CMAKE_BINARY_DIR}/.. INCLUDE_INTERNALS all_packages QTD_VERSION_STR QTD_VERSION) +endif(${CMAKE_BINARY_DIR} STREQUAL ${CMAKE_SOURCE_DIR}) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) FIND_PACKAGE(D REQUIRED) FIND_PACKAGE(Qt4 REQUIRED)