equal
deleted
inserted
replaced
29 |
29 |
30 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules) |
30 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules) |
31 |
31 |
32 set(CPACK_PACKAGE_VERSION_MAJOR "0") |
32 set(CPACK_PACKAGE_VERSION_MAJOR "0") |
33 set(CPACK_PACKAGE_VERSION_MINOR "9") |
33 set(CPACK_PACKAGE_VERSION_MINOR "9") |
34 set(CPACK_PACKAGE_VERSION_PATCH "15${version_suffix}") |
34 set(CPACK_PACKAGE_VERSION_PATCH "16${version_suffix}") |
35 |
35 |
36 #forbid in-tree building |
36 #forbid in-tree building |
37 #IF (${CMAKE_SOURCE_DIR} MATCHES ${CMAKE_BINARY_DIR}) |
37 #IF (${CMAKE_SOURCE_DIR} MATCHES ${CMAKE_BINARY_DIR}) |
38 # MESSAGE(STATUS "Please do an out-of-tree build:") |
38 # MESSAGE(STATUS "Please do an out-of-tree build:") |
39 # MESSAGE(STATUS "rm CMakeCache.txt; mkdir build; cd build; cmake ..; make") |
39 # MESSAGE(STATUS "rm CMakeCache.txt; mkdir build; cd build; cmake ..; make") |
163 set(SHAREPATH share/hedgewars/) |
163 set(SHAREPATH share/hedgewars/) |
164 endif() |
164 endif() |
165 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) |
165 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) |
166 |
166 |
167 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") |
167 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") |
168 set(HEDGEWARS_PROTO_VER 34) |
168 set(HEDGEWARS_PROTO_VER 38) |
169 |
169 |
170 if(WITH_SERVER) |
170 if(WITH_SERVER) |
171 message(STATUS "Server is going to be built! Make sure you have GHC installed") |
171 message(STATUS "Server is going to be built! Make sure you have GHC installed") |
172 set(HAVE_NETSERVER true) |
172 set(HAVE_NETSERVER true) |
173 add_subdirectory(gameServer) |
173 add_subdirectory(gameServer) |