Mercurial Mercurial > hedgewars-draft / 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.
use CMAKE_CURRENT_SOURCE_DIR consistently
authorkoda
Fri, 24 Jan 2014 10:56:22 +0100
changeset 10068 cbe06dc07332
parent 10067 8df84ec62600
child 10069 c4ad9c76b542
use CMAKE_CURRENT_SOURCE_DIR consistently
gameServer/CMakeLists.txt file | annotate | diff | comparison | revisions
share/CMakeLists.txt file | annotate | diff | comparison | revisions 
--- a/gameServer/CMakeLists.txt	Fri Jan 24 10:39:41 2014 +0400
+++ b/gameServer/CMakeLists.txt	Fri Jan 24 10:56:22 2014 +0100
@@ -28,11 +28,11 @@
     hedgewars-server.hs
     )
 
-set(hwserv_main ${CMAKE_SOURCE_DIR}/gameServer/hedgewars-server.hs)
+set(hwserv_main ${CMAKE_CURRENT_SOURCE_DIR}/hedgewars-server.hs)
 
 set(ghc_flags
     --make ${hwserv_main}
-    -i${CMAKE_CURRENT_SOURCE_DIR}
+    -i ${CMAKE_CURRENT_SOURCE_DIR}
     -o ${EXECUTABLE_OUTPUT_PATH}/hedgewars-server${CMAKE_EXECUTABLE_SUFFIX}
     -odir ${CMAKE_CURRENT_BINARY_DIR}
     -hidir ${CMAKE_CURRENT_BINARY_DIR}
--- a/share/CMakeLists.txt	Fri Jan 24 10:39:41 2014 +0400
+++ b/share/CMakeLists.txt	Fri Jan 24 10:56:22 2014 +0100
@@ -12,15 +12,15 @@
         set(minimum_macosx_version "10.6.3")
     endif()
 
-    configure_file(${hedgewars_SOURCE_DIR}/share/Info.plist.in
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
                    ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
     #path here should be Hedgewars.app/Contents/MacOS
     install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/Info.plist"
             DESTINATION ../)
-    install(PROGRAMS "${hedgewars_SOURCE_DIR}/share/Icon.icns"
+    install(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/Icon.icns"
             DESTINATION ../Resources/)
-    install(PROGRAMS "${hedgewars_SOURCE_DIR}/share/hwico.icns"
+    install(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/hwico.icns"
             DESTINATION ../Resources/)
-    install(PROGRAMS "${hedgewars_SOURCE_DIR}/share/dsa_pub.pem"
+    install(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/dsa_pub.pem"
             DESTINATION ../Resources/)
 endif(APPLE)
hedgewars-draft