weird merge on mkcmake.sh
authorTero Marttila <terom@fixme.fi>
Fri, 16 Jan 2009 22:25:41 +0200
changeset 403 c2f2ea58e411
parent 402 ce1e536ec897 (diff)
parent 401 6cd204d05600 (current diff)
child 404 7058ee22ee39
weird merge on mkcmake.sh
--- a/cmake/BuildVersion.cmake	Fri Jan 16 22:06:51 2009 +0200
+++ b/cmake/BuildVersion.cmake	Fri Jan 16 22:25:41 2009 +0200
@@ -1,9 +1,12 @@
 #
 # Run a cmake script to update version info on every build
 #
+
+SET (PROJECT_VERSION_FILE "${CMAKE_BINARY_DIR}/src/version.c")
+
 ADD_CUSTOM_TARGET (
     version_info ALL 
-    COMMAND ${CMAKE_COMMAND} -DOUTPUT_PATH="${CMAKE_BINARY_DIR}/src/version.c" -P ${CMAKE_SOURCE_DIR}/cmake/VersionScript.cmake
+    COMMAND ${CMAKE_COMMAND} -DPROJECT_VERSION_FILE="${PROJECT_VERSION_FILE}" -P ${CMAKE_SOURCE_DIR}/cmake/VersionScript.cmake
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 )
 
--- a/cmake/VersionScript.cmake	Fri Jan 16 22:06:51 2009 +0200
+++ b/cmake/VersionScript.cmake	Fri Jan 16 22:25:41 2009 +0200
@@ -1,5 +1,4 @@
-# location of output version.c
-SET (PROJECT_VERSION_FILE ${OUTPUT_PATH})
+# location of output file is given as PROJECT_VERSION_FILE
 
 # include cmake stuff
 include ("cmake/FindVersion.cmake")
@@ -13,6 +12,6 @@
 
 # create version.c
 CONFIGURE_FILE (
-    "src/version.c.in" ${PROJECT_VERSION_FILE} @ONLY
+    "${CMAKE_SOURCE_DIR}/src/version.c.in" "${PROJECT_VERSION_FILE}" @ONLY
 )
 
--- a/doc/CMakeLists.txt	Fri Jan 16 22:06:51 2009 +0200
+++ b/doc/CMakeLists.txt	Fri Jan 16 22:25:41 2009 +0200
@@ -2,7 +2,7 @@
 find_package(Doxygen)
 
 # set our .dox path
-SET (PROJECT_DOX_FILE "${CMAKE_CURRENT_SOURCE_DIR}/kishna-glista.dox")
+SET (PROJECT_DOX_FILE "${CMAKE_CURRENT_SOURCE_DIR}/kisna-glista.dox")
 
 # Where to install doxygen output
 set(PROJECT_DOXYGEN_DIR "${PROJECT_SOURCE_DIR}/doc")
--- a/doc/kishna-glista.dox	Fri Jan 16 22:06:51 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-/**
-@mainpage Kishna Glista
-
-Kishna Glista is a... wait for it... <a href="http://en.wikipedia.org/wiki/Liero">Liero</a> clone.
-
-*/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/kisna-glista.dox	Fri Jan 16 22:25:41 2009 +0200
@@ -0,0 +1,13 @@
+/**
+@mainpage Kisna Glista
+
+\subsection what What
+Kisna Glista is a Liero clone with network multiplayer.
+
+\subsection homepage Project Homepage
+Visit <a href="http://kg.qmsk.net/">http://kg.qmsk.net/</a> for the project Trac.
+
+\subsection how How
+Most major classes should be sufficiently documented for the doxygen documentation to actually be useful.
+
+*/