Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
oooooops forgot SHAREPATH is still used somewhere
authorkoda
Mon, 04 Mar 2013 22:58:01 +0100
changeset 8649 e3a9339ce1fd
parent 8648 364535926399
child 8650 18807b6302c8
oooooops forgot SHAREPATH is still used somewhere
share/CMakeLists.txt file | annotate | diff | comparison | revisions
share/hedgewars/CMakeLists.txt file | annotate | diff | comparison | revisions
share/hedgewars/Data/misc/CMakeLists.txt file | annotate | diff | comparison | revisions 
--- a/share/CMakeLists.txt	Mon Mar 04 16:18:21 2013 -0500
+++ b/share/CMakeLists.txt	Mon Mar 04 22:58:01 2013 +0100
@@ -1,4 +1,7 @@
-add_subdirectory(hedgewars)
+
+set(SHAREPATH ${HEDGEWARS_DATADIR})
+
+add_subdirectory(hedgewars/Data)
 
 if(APPLE)
     #needed for CFBundleVersion and CFBundleShortVersionString
--- a/share/hedgewars/CMakeLists.txt	Mon Mar 04 16:18:21 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-add_subdirectory(Data)
--- a/share/hedgewars/Data/misc/CMakeLists.txt	Mon Mar 04 16:18:21 2013 -0500
+++ b/share/hedgewars/Data/misc/CMakeLists.txt	Mon Mar 04 22:58:01 2013 +0100
@@ -4,6 +4,6 @@
 
     file(GLOB miscfiles *.xml *.desktop)
 
-    install(FILES ${miscfiles} DESTINATION ${HEDGEWARS_FULL_DATADIR}/Data/misc)
+    install(FILES ${miscfiles} DESTINATION ${SHAREPATH}/Data/misc)
 endif()
hedgewars