X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=CMakeLists.txt;h=83505a8ef2284ee12a30adb7230eeb98b1a93ae6;hb=HEAD;hp=9a9dde2ca4b02ae9100c70cfd49b9542c20cf915;hpb=5e32f9729857c1322c2cf7d627f6e1692e15020b;p=supertux.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a9dde2ca..83505a8ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@
 PROJECT(SUPERTUX)
 
 ## Version, for display in title bar.
-## Will add 'commit <hash>' to the end if git is available.
+## Will add 'commit <hash>' to the end if git is available and this is a git repository.
 SET(SUPERTUX_VERSION "0.3.4-GIT")
 
 ### CMake configuration
@@ -106,7 +106,7 @@ INCLUDE_DIRECTORIES(${VORBIS_INCLUDE_DIR})
 FIND_PACKAGE(PhysFS REQUIRED)
 INCLUDE_DIRECTORIES(${PHYSFS_INCLUDE_DIR})
 
-FIND_PACKAGE(CURL)
+FIND_PACKAGE(CURL REQUIRED)
 IF(CURL_FOUND)
   INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIR})
   SET(HAVE_LIBCURL TRUE)
@@ -120,7 +120,10 @@ ENDIF(CURL_FOUND)
 MARK_AS_ADVANCED(GIT_EXECUTABLE)
 FIND_PROGRAM(GIT_EXECUTABLE git)
 
-IF(GIT_EXECUTABLE)
+# The .git directory inside the base directory
+SET(GIT_CFG_DIR "${CMAKE_BINARY_DIR}/.git/")
+
+IF(GIT_EXECUTABLE AND EXISTS ${GIT_CFG_DIR})
   ADD_CUSTOM_TARGET(gitversion ALL
                     ${CMAKE_COMMAND} -E echo "#ifndef VERSION_H" > "${CMAKE_BINARY_DIR}/version.h.tmp"
                     COMMAND ${CMAKE_COMMAND} -E echo "#define VERSION_H" >> "${CMAKE_BINARY_DIR}/version.h.tmp"
@@ -133,7 +136,7 @@ IF(GIT_EXECUTABLE)
                     WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
                     COMMENT "Updating ${CMAKE_BINARY_DIR}/version.h..."
                     VERBATIM)
-ELSE(GIT_EXECUTABLE)
+ELSE(GIT_EXECUTABLE AND EXISTS ${GIT_CFG_DIR})
   ADD_CUSTOM_TARGET(gitversion ALL
                     ${CMAKE_COMMAND} -E echo "#ifndef VERSION_H" > "${CMAKE_BINARY_DIR}/version.h.tmp"
                     COMMAND ${CMAKE_COMMAND} -E echo "#define VERSION_H" >> "${CMAKE_BINARY_DIR}/version.h.tmp"
@@ -144,7 +147,7 @@ ELSE(GIT_EXECUTABLE)
                     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
                     COMMENT "Updating ${CMAKE_BINARY_DIR}/version.h..."
                     VERBATIM)
-ENDIF(GIT_EXECUTABLE)
+ENDIF(GIT_EXECUTABLE AND EXISTS ${GIT_CFG_DIR})
 
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_BINARY_DIR}/version.h
                             PROPERTIES GENERATED true)
@@ -178,10 +181,13 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
 ## MSVC Compatibility headers and definitions
 
 IF(MSVC)
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/mk/msvc)
-  ADD_DEFINITIONS(-D_USE_MATH_DEFINES -DNOMINMAX)
+  include_directories (${CMAKE_CURRENT_SOURCE_DIR}/mk/msvc)
 ENDIF(MSVC)
 
+IF(WIN32)
+  ADD_DEFINITIONS(-D_USE_MATH_DEFINES -DNOMINMAX)
+ENDIF(WIN32)
+
 ## Build list of sources for supertux binary
 
 FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/obstack/*.c external/findlocale/findlocale.c)