equal
deleted
inserted
replaced
82 |
82 |
83 #versioning |
83 #versioning |
84 set(CPACK_PACKAGE_VERSION_MAJOR 0) |
84 set(CPACK_PACKAGE_VERSION_MAJOR 0) |
85 set(CPACK_PACKAGE_VERSION_MINOR 9) |
85 set(CPACK_PACKAGE_VERSION_MINOR 9) |
86 set(CPACK_PACKAGE_VERSION_PATCH 19) |
86 set(CPACK_PACKAGE_VERSION_PATCH 19) |
87 set(HEDGEWARS_PROTO_VER 44) |
87 set(HEDGEWARS_PROTO_VER 45) |
88 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") |
88 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") |
89 |
89 |
90 message(STATUS "Building ${HEDGEWARS_VERSION}-r${HEDGEWARS_REVISION} (${HEDGEWARS_HASH})") |
90 message(STATUS "Building ${HEDGEWARS_VERSION}-r${HEDGEWARS_REVISION} (${HEDGEWARS_HASH})") |
91 |
91 |
92 |
92 |
253 unset(CMAKE_REQUIRED_FLAGS) |
253 unset(CMAKE_REQUIRED_FLAGS) |
254 |
254 |
255 #parse additional parameters |
255 #parse additional parameters |
256 if(FPFLAGS OR GHFLAGS) |
256 if(FPFLAGS OR GHFLAGS) |
257 if(${allow_parse_args}) |
257 if(${allow_parse_args}) |
258 message(${WARNING} "FPFLAGS and GHFLAGS are available only when using CMake >= 2.8") |
|
259 else() |
|
260 separate_arguments(fpflags_parsed UNIX_COMMAND ${FPFLAGS}) |
258 separate_arguments(fpflags_parsed UNIX_COMMAND ${FPFLAGS}) |
261 separate_arguments(ghflags_parsed UNIX_COMMAND ${GHFLAGS}) |
259 separate_arguments(ghflags_parsed UNIX_COMMAND ${GHFLAGS}) |
|
260 else() |
|
261 message(${WARNING} "FPFLAGS and GHFLAGS are available only when using CMake >= 2.8") |
262 endif() |
262 endif() |
263 endif() |
263 endif() |
264 |
264 |
265 list(APPEND pascal_flags ${fpflags_parsed} # user flags |
265 list(APPEND pascal_flags ${fpflags_parsed} # user flags |
266 "-B" # compile all units |
266 "-B" # compile all units |