equal
deleted
inserted
replaced
28 |
28 |
29 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules) |
29 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules) |
30 |
30 |
31 set(CPACK_PACKAGE_VERSION_MAJOR "0") |
31 set(CPACK_PACKAGE_VERSION_MAJOR "0") |
32 set(CPACK_PACKAGE_VERSION_MINOR "9") |
32 set(CPACK_PACKAGE_VERSION_MINOR "9") |
33 set(CPACK_PACKAGE_VERSION_PATCH "13${version_suffix}") |
33 set(CPACK_PACKAGE_VERSION_PATCH "14${version_suffix}") |
34 |
34 |
35 #forbid in-tree building |
35 #forbid in-tree building |
36 #IF (${CMAKE_SOURCE_DIR} MATCHES ${CMAKE_BINARY_DIR}) |
36 #IF (${CMAKE_SOURCE_DIR} MATCHES ${CMAKE_BINARY_DIR}) |
37 # MESSAGE(STATUS "Please do an out-of-tree build:") |
37 # MESSAGE(STATUS "Please do an out-of-tree build:") |
38 # MESSAGE(STATUS "rm CMakeCache.txt; mkdir build; cd build; cmake ..; make") |
38 # MESSAGE(STATUS "rm CMakeCache.txt; mkdir build; cd build; cmake ..; make") |
150 set(SHAREPATH share/hedgewars/) |
150 set(SHAREPATH share/hedgewars/) |
151 endif() |
151 endif() |
152 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) |
152 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) |
153 |
153 |
154 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") |
154 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") |
155 set(HEDGEWARS_PROTO_VER 31) |
155 set(HEDGEWARS_PROTO_VER 32) |
156 |
156 |
157 if(WITH_SERVER) |
157 if(WITH_SERVER) |
158 set(HAVE_NETSERVER true) |
158 set(HAVE_NETSERVER true) |
159 add_subdirectory(gameServer) |
159 add_subdirectory(gameServer) |
160 if(APPLE) |
160 if(APPLE) |