diff 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
line wrap: on
line diff
--- a/CMakeLists.txt	Wed Dec 23 04:45:55 2009 +0500
+++ b/CMakeLists.txt	Wed Dec 23 04:48:11 2009 +0500
@@ -123,14 +123,14 @@
 make_native_path(cd_path)
 add_custom_command(TARGET main POST_BUILD	
 	COMMAND ${CMAKE_COMMAND} ARGS -E make_directory ${CMAKE_BINARY_DIR}/build
-	COMMAND cd ARGS ${cd_path} && ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} -DSECOND_RUN=1 ${CMAKE_SOURCE_DIR} && ${make_util}
+	COMMAND cd  ARGS ${cd_path} && ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} -DSECOND_RUN=1 ${CMAKE_SOURCE_DIR} && ${make_util}
 	COMMENT ""	
 	)  
 
 ## "Make install" command.
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/build)
 add_custom_target(install
-	COMMAND cd ARGS ${cd_path} && ${make_util} install
+	COMMAND cd ${CMAKE_BINARY_DIR}/build && ${make_util} install
 	COMMENT ""
 	)  
 add_dependencies(install preinstall)