Mercurial > projects > qtd
comparison CMakeLists.txt @ 309:8a0cf14e3419 signals
wrong merge
author | eldar_ins@eldar-laptop |
---|---|
date | Wed, 23 Dec 2009 04:48:11 +0500 |
parents | 3b79bd4298e8 |
children | baaf74652f4c |
comparison
equal
deleted
inserted
replaced
308:2485419c5c63 | 309:8a0cf14e3419 |
---|---|
121 endif(${CMAKE_BINARY_DIR} STREQUAL ${CMAKE_SOURCE_DIR}) | 121 endif(${CMAKE_BINARY_DIR} STREQUAL ${CMAKE_SOURCE_DIR}) |
122 | 122 |
123 make_native_path(cd_path) | 123 make_native_path(cd_path) |
124 add_custom_command(TARGET main POST_BUILD | 124 add_custom_command(TARGET main POST_BUILD |
125 COMMAND ${CMAKE_COMMAND} ARGS -E make_directory ${CMAKE_BINARY_DIR}/build | 125 COMMAND ${CMAKE_COMMAND} ARGS -E make_directory ${CMAKE_BINARY_DIR}/build |
126 COMMAND cd ARGS ${cd_path} && ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} -DSECOND_RUN=1 ${CMAKE_SOURCE_DIR} && ${make_util} | 126 COMMAND cd ARGS ${cd_path} && ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} -DSECOND_RUN=1 ${CMAKE_SOURCE_DIR} && ${make_util} |
127 COMMENT "" | 127 COMMENT "" |
128 ) | 128 ) |
129 | 129 |
130 ## "Make install" command. | 130 ## "Make install" command. |
131 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/build) | 131 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/build) |
132 add_custom_target(install | 132 add_custom_target(install |
133 COMMAND cd ARGS ${cd_path} && ${make_util} install | 133 COMMAND cd ${CMAKE_BINARY_DIR}/build && ${make_util} install |
134 COMMENT "" | 134 COMMENT "" |
135 ) | 135 ) |
136 add_dependencies(install preinstall) | 136 add_dependencies(install preinstall) |
137 | 137 |
138 ##-------------------------------------------- | 138 ##-------------------------------------------- |