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.
hgignore and skip one config file for win32
authorkoda
Wed, 24 Oct 2012 10:23:37 +0100
changeset 7811 49ab679cb384
parent 7810 da60e6b6baa3
child 7812 00696c1450da
hgignore and skip one config file for win32
.hgignore file | annotate | diff | comparison | revisions
share/hedgewars/Data/misc/CMakeLists.txt file | annotate | diff | comparison | revisions 
--- a/.hgignore	Wed Oct 24 10:18:42 2012 +0100
+++ b/.hgignore	Wed Oct 24 10:23:37 2012 +0100
@@ -53,3 +53,6 @@
 glob:project_files/Android-build/Makefile.android
 glob:hedgewars-build-desktop-Qt_4_7_4_for_Desktop_-_MinGW_4_4__Qt_SDK__Debug
 glob:hedgewars-build-desktop-Qt_4_7_4_for_Desktop_-_MinGW_4_4__Qt_SDK__Release
+glob:*.depends
+glob:tools/build_windows_koda.bat
+
--- a/share/hedgewars/Data/misc/CMakeLists.txt	Wed Oct 24 10:18:42 2012 +0100
+++ b/share/hedgewars/Data/misc/CMakeLists.txt	Wed Oct 24 10:23:37 2012 +0100
@@ -1,9 +1,13 @@
-if(DEFINED DATA_INSTALL_DIR)                                                                                                            
-    set(HEDGEWARS_DATADIR ${DATA_INSTALL_DIR})                                                                                          
-else()                                                                                                                                  
-    set(HEDGEWARS_DATADIR ${CMAKE_INSTALL_PREFIX}/share/)                                                                               
+if(DEFINED DATA_INSTALL_DIR)
+    set(HEDGEWARS_DATADIR ${DATA_INSTALL_DIR}
+)
+else()
+    set(HEDGEWARS_DATADIR ${CMAKE_INSTALL_PREFIX}/share/)
 endif()  
+
+if(UNIX AND NOT APPLE)
 configure_file(hwengine.desktop.in hwengine.desktop)
+endif()
 
 file(GLOB miscfiles *.xml *.desktop)
hedgewars