Merge ../ldforge into gl

Tue, 08 Apr 2014 11:04:35 +0300

author
Santeri Piippo <crimsondusk64@gmail.com>
date
Tue, 08 Apr 2014 11:04:35 +0300
changeset 710
86a19bfc34de
parent 709
47a2f9d10ebe (current diff)
parent 657
5cfbf4dffebf (diff)
child 711
7f7cbe63b16f

Merge ../ldforge into gl

CMakeLists.txt file | annotate | diff | comparison | revisions
--- a/CMakeLists.txt	Tue Apr 08 11:00:29 2014 +0300
+++ b/CMakeLists.txt	Tue Apr 08 11:04:35 2014 +0300
@@ -12,8 +12,8 @@
 get_target_property (UPDATEREVISION_EXE updaterevision LOCATION)
 
 add_custom_target (revision_check ALL
-    COMMAND ${UPDATEREVISION_EXE} src/gitinfo.h
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    COMMAND ${UPDATEREVISION_EXE} gitinfo.h
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     DEPENDS updaterevision)
 
 include_directories (${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
@@ -133,4 +133,5 @@
 	${OPENGL_LIBRARIES}
 )
 
+add_dependencies (ldforge revision_check)
 install (TARGETS ldforge RUNTIME DESTINATION bin)

mercurial