comparison CMakeLists.txt @ 240:8b1a982c9ac3

another fix for cmake
author SokoL_SD
date Mon, 20 Jul 2009 08:31:43 +0000
parents 4716eaf4a67e
children e792a5287673
comparison
equal deleted inserted replaced
239:4716eaf4a67e 240:8b1a982c9ac3
125 ) 125 )
126 126
127 ## Make commands. 127 ## Make commands.
128 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/build) 128 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/build)
129 add_custom_target(install 129 add_custom_target(install
130 COMMAND cd ${CMAKE_BINARY_DIR}/CMakeFiles/build && ${make_util} install 130 COMMAND cd ${CMAKE_BINARY_DIR}/build && ${make_util} install
131 COMMENT "" 131 COMMENT ""
132 ) 132 )
133 add_dependencies(install preinstall) 133 add_dependencies(install preinstall)
134 134
135 ##-------------------------------------------- 135 ##--------------------------------------------
160 ## Building QtD. 160 ## Building QtD.
161 ########################################################## 161 ##########################################################
162 else(NOT SECOND_RUN) 162 else(NOT SECOND_RUN)
163 163
164 PROJECT(qtd CXX C) 164 PROJECT(qtd CXX C)
165 load_cache(${CMAKE_BINARY_DIR} INCLUDE_INTERNALS all_packages QTD_VERSION_STR QTD_VERSION) 165 if(NOT ${CMAKE_BINARY_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
166 load_cache(${CMAKE_BINARY_DIR}/.. INCLUDE_INTERNALS all_packages QTD_VERSION_STR QTD_VERSION)
167 endif(${CMAKE_BINARY_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
166 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) 168 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
167 FIND_PACKAGE(D REQUIRED) 169 FIND_PACKAGE(D REQUIRED)
168 FIND_PACKAGE(Qt4 REQUIRED) 170 FIND_PACKAGE(Qt4 REQUIRED)
169 171
170 set(QTD_VERSION_STR ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}) 172 set(QTD_VERSION_STR ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH})