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 "12") |
13 set(CPACK_PACKAGE_VERSION_PATCH "13-dev") |
14 |
14 |
15 set(universal_build false) |
15 set(universal_build false) |
16 |
16 |
17 if(APPLE) |
17 if(APPLE) |
18 set(bundle_name Hedgewars.app) |
18 set(bundle_name Hedgewars.app) |
55 set(SHAREPATH share/hedgewars/) |
55 set(SHAREPATH share/hedgewars/) |
56 endif(DEFINED DATA_INSTALL_DIR) |
56 endif(DEFINED DATA_INSTALL_DIR) |
57 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) |
57 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) |
58 |
58 |
59 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") |
59 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") |
60 set(HEDGEWARS_PROTO_VER 29) |
60 set(HEDGEWARS_PROTO_VER 30) |
61 |
61 |
62 if(WITH_SERVER) |
62 if(WITH_SERVER) |
63 set(HAVE_NETSERVER true) |
63 set(HAVE_NETSERVER true) |
64 add_subdirectory(gameServer) |
64 add_subdirectory(gameServer) |
65 else(WITH_SERVER) |
65 else(WITH_SERVER) |