equal
deleted
inserted
replaced
8 |
8 |
9 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules) |
9 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules) |
10 |
10 |
11 set(CPACK_PACKAGE_VERSION_MAJOR "0") |
11 set(CPACK_PACKAGE_VERSION_MAJOR "0") |
12 set(CPACK_PACKAGE_VERSION_MINOR "9") |
12 set(CPACK_PACKAGE_VERSION_MINOR "9") |
13 set(CPACK_PACKAGE_VERSION_PATCH "11") |
13 set(CPACK_PACKAGE_VERSION_PATCH "12-dev") |
14 |
14 |
15 set(universal_build "0") |
15 set(universal_build "0") |
16 |
16 |
17 if(APPLE) |
17 if(APPLE) |
18 set(CMAKE_INSTALL_PREFIX "Hedgewars.app/Contents/MacOS/") |
18 set(CMAKE_INSTALL_PREFIX "Hedgewars.app/Contents/MacOS/") |
31 set(SHAREPATH share/hedgewars/) |
31 set(SHAREPATH share/hedgewars/) |
32 endif(DEFINED DATA_INSTALL_DIR) |
32 endif(DEFINED DATA_INSTALL_DIR) |
33 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) |
33 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) |
34 |
34 |
35 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") |
35 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") |
36 set(HEDGEWARS_PROTO_VER 27) |
36 set(HEDGEWARS_PROTO_VER 28) |
37 |
37 |
38 if(WITH_SERVER) |
38 if(WITH_SERVER) |
39 set(HAVE_NETSERVER true) |
39 set(HAVE_NETSERVER true) |
40 add_subdirectory(gameServer) |
40 add_subdirectory(gameServer) |
41 else(WITH_SERVER) |
41 else(WITH_SERVER) |