diff -r 31570b766315 -r ed5a6478e710 CMakeLists.txt --- a/CMakeLists.txt Tue Nov 10 18:16:35 2015 +0100 +++ b/CMakeLists.txt Tue Nov 10 20:43:13 2015 +0100 @@ -12,18 +12,18 @@ include(${CMAKE_MODULE_PATH}/utils.cmake) #possible cmake configuration -option(NOSERVER "Disable gameServer build (off)]" OFF) +option(NOSERVER "Disable gameServer build (off)" OFF) option(NOPNG "Disable screenshoot compression (off)" OFF) option(NOVIDEOREC "Disable video recording (off)" OFF) #libraries are built shared unless explicitly added as a static option(BUILD_SHARED_LIBS "Build libraries as shared modules (on)" ON) -#set this to ON when 2.1.0 becomes more widespread (and only for linux) -option(PHYSFS_SYSTEM "Use system physfs (off)" OFF) if(WIN32 OR APPLE) + option(PHYSFS_SYSTEM "Use system physfs (off)" OFF) option(LUA_SYSTEM "Use system lua (off)" OFF) else() + option(PHYSFS_SYSTEM "Use system physfs (on)" ON) option(LUA_SYSTEM "Use system lua (on)" ON) endif() @@ -32,18 +32,28 @@ option(MINIMAL_FLAGS "Respect system flags as much as possible (off)" OFF) option(NOAUTOUPDATE "Disable OS X Sparkle update checking (off)" OFF) +option(SKIPBUNDLE "Do not create relocate bundle (off)" OFF) + +option(BUILD_ENGINE_C "Compile hwengine as native C (off)" OFF) +option(GL2 "Enable OpenGL 2 rendering !!!EXPERIMENTAL - DO NOT USE!!! [default: off)" OFF) set(GHFLAGS "" CACHE STRING "Additional Haskell flags") if(UNIX AND NOT APPLE) set(DATA_INSTALL_DIR "share/hedgewars" CACHE STRING "Resource folder path") endif() +option(NOVERSIONINFOUPDATE "Disable update of version_info.txt. To be used if source is in a git/repo that is NOT the hedgewars repo" OFF) + +#system paths for finding required fonts (see share/hedgewars/Data/fonts) +#subdirectories will NOT be searched. +#all fonts that can't be found will be bundled with hedgewars +set(FONTS_DIRS "" CACHE STRING "Additional paths to folders where required fonts can be found ( ; is separator)") #versioning set(CPACK_PACKAGE_VERSION_MAJOR 0) set(CPACK_PACKAGE_VERSION_MINOR 9) -set(CPACK_PACKAGE_VERSION_PATCH 20) -set(HEDGEWARS_PROTO_VER 46) +set(CPACK_PACKAGE_VERSION_PATCH 23) +set(HEDGEWARS_PROTO_VER 52) set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") include(${CMAKE_MODULE_PATH}/revinfo.cmake) @@ -53,20 +63,24 @@ include(${CMAKE_MODULE_PATH}/paths.cmake) #general utilities include(${CMAKE_MODULE_PATH}/utils.cmake) +#paths initialization +include(${CMAKE_MODULE_PATH}/paths.cmake) #platform specific init code include(${CMAKE_MODULE_PATH}/platform.cmake) #when build type is not specified, assume Debug/Release according to build version information -if (CMAKE_BUILD_TYPE) - string (TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE) - if ( NOT( (CMAKE_BUILD_TYPE MATCHES "RELEASE") OR (CMAKE_BUILD_TYPE MATCHES "DEBUG") ) ) - set (CMAKE_BUILD_TYPE ${default_build_type} CACHE STRING "Build type (Debug/Release)" FORCE) - message (STATUS "Unknown build type, using default (${default_build_type})") - endif () -else (CMAKE_BUILD_TYPE) - set (CMAKE_BUILD_TYPE ${default_build_type} CACHE STRING "Build type (Debug/Release)" FORCE) -endif (CMAKE_BUILD_TYPE) +if(CMAKE_BUILD_TYPE) + string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE) + if(NOT((CMAKE_BUILD_TYPE MATCHES "RELEASE") OR + (CMAKE_BUILD_TYPE MATCHES "DEBUG") OR + (CMAKE_BUILD_TYPE MATCHES "RELWITHDEBINFO"))) + set(CMAKE_BUILD_TYPE ${default_build_type} CACHE STRING "Build type (Debug/Release/RelWithDebInfo)" FORCE) + message(STATUS "Unknown build type ${CMAKE_BUILD_TYPE}, using default (${default_build_type})") + endif() +else(CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE ${default_build_type} CACHE STRING "Build type (Debug/Release/RelWithDebInfo)" FORCE) +endif(CMAKE_BUILD_TYPE) #perform safe check that enable/disable compilation features @@ -74,17 +88,14 @@ #set default compiler flags add_flag_append(CMAKE_C_FLAGS "-Wall -pipe") -add_flag_append(CMAKE_C_FLAGS_RELEASE "-Os") +add_flag_append(CMAKE_C_FLAGS_RELEASE "-O2") add_flag_append(CMAKE_C_FLAGS_DEBUG "-Wextra -O0") add_flag_append(CMAKE_CXX_FLAGS "-Wall -pipe") -add_flag_append(CMAKE_CXX_FLAGS_RELEASE "-Os") +add_flag_append(CMAKE_CXX_FLAGS_RELEASE "-O2") add_flag_append(CMAKE_CXX_FLAGS_DEBUG "-Wextra -O0") -add_flag_append(CMAKE_Pascal_FLAGS "-Cs2000000") -add_flag_append(CMAKE_Pascal_FLAGS_DEBUG "-O- -gv") -add_flag_append(CMAKE_Pascal_FLAGS_RELEASE "-Os -Xs") #CMake adds a lot of additional configuration flags, so let's clear them up -if(${MINIMAL_FLAGS}) +if(MINIMAL_FLAGS) unset(CMAKE_C_FLAGS_RELEASE) unset(CMAKE_C_FLAGS_DEBUG) unset(CMAKE_CXX_FLAGS_RELEASE) @@ -97,7 +108,7 @@ if(${CMAKE_VERSION} VERSION_GREATER 2.6) separate_arguments(ghflags_parsed UNIX_COMMAND ${GHFLAGS}) else() - message(${WARNING} "GHFLAGS are available only when using CMake >= 2.8") + message("*** GHFLAGS are available only when using CMake >= 2.8 ***") endif() endif() @@ -109,6 +120,7 @@ list(APPEND haskell_flags "-Wall" # all warnings "-debug" # debug mode "-dcore-lint" # internal sanity check + "-fno-warn-unused-do-bind" ) else() list(APPEND haskell_flags "-w" # no warnings @@ -116,14 +128,32 @@ endif() +#build engine without freepascal +if(BUILD_ENGINE_C) + find_package(Clang REQUIRED) + + if(${CLANG_VERSION} VERSION_LESS "3.0") + message(FATAL_ERROR "LLVM/Clang compiler required version is 3.0 but version ${CLANG_VERSION} was found!") + endif() + + set(CMAKE_C_COMPILER ${CLANG_EXECUTABLE}) + set(CMAKE_CXX_COMPILER ${CLANG_EXECUTABLE}) +endif() + + +#server +if(NOT NOSERVER) + add_subdirectory(gameServer) +endif() + + #lua discovery -if (${LUA_SYSTEM}) - if (NOT LUA_LIBRARY OR NOT LUA_INCLUDE_DIR) +if(LUA_SYSTEM) + if(NOT LUA_LIBRARY OR NOT LUA_INCLUDE_DIR) find_package(Lua) endif() - if (LUA_LIBRARY AND LUA_INCLUDE_DIR) - set(LUA_FOUND TRUE) + if(LUA_LIBRARY AND LUA_INCLUDE_DIR) #use an IMPORTED tharget so that we can just use 'lua' to link add_library(lua UNKNOWN IMPORTED) set_target_properties(lua PROPERTIES IMPORTED_LOCATION ${LUA_LIBRARY}) @@ -131,7 +161,7 @@ message(FATAL_ERROR "Missing Lua! Rerun cmake with -DLUA_SYSTEM=off to build the internal version") endif() else() - if (NOT LUA_LIBRARY OR NOT LUA_INCLUDE_DIR) + if(NOT LUA_LIBRARY OR NOT LUA_INCLUDE_DIR) message(STATUS "LUA will be provided by the bundled sources") endif() set(lua_output_name "hwlua") @@ -140,8 +170,8 @@ #physfs discovery -if (${PHYSFS_SYSTEM}) - if (NOT PHYSFS_LIBRARY OR NOT PHYSFS_INCLUDE_DIR) +if(PHYSFS_SYSTEM) + if(NOT PHYSFS_LIBRARY OR NOT PHYSFS_INCLUDE_DIR) find_package(PhysFS) endif() @@ -155,54 +185,71 @@ string(REGEX MATCH "([0-9]+)" physfs_patchversion "${physfs_patchversion}") set(physfs_detected_ver "${physfs_majorversion}.${physfs_minorversion}.${physfs_patchversion}") - if (physfs_detected_ver VERSION_LESS "2.1.0") - message(FATAL_ERROR "PhysFS version is too old (dected ${physfs_detected_ver}, required 2.1.0)") - set(physfs_too_old true) + if(${physfs_detected_ver} VERSION_LESS 2.0.0) + message(FATAL_ERROR "PhysFS version is too old (detected ${physfs_detected_ver}, required 2.0.0)\n" + "Perform an update or rerun cmake with -DPHYSFS_SYSTEM=off to build the internal version") endif() endif() - if (NOT PHYSFS_LIBRARY OR NOT PHYSFS_INCLUDE_DIR) - message(FATAL_ERROR "Missing PhysFS! Rerun cmake with -DPHYSFS_SYSTEM=off to build the internal version") - else() + if(PHYSFS_LIBRARY AND PHYSFS_INCLUDE_DIR) #use an IMPORTED tharget so that we can just use 'physfs' to link add_library(physfs UNKNOWN IMPORTED) set_target_properties(physfs PROPERTIES IMPORTED_LOCATION ${PHYSFS_LIBRARY}) + else() + message(FATAL_ERROR "Missing PhysFS! Rerun cmake with -DPHYSFS_SYSTEM=off to build the internal version") endif() else() - if (NOT PHYSFS_LIBRARY OR NOT PHYSFS_INCLUDE_DIR) + if(NOT PHYSFS_LIBRARY OR NOT PHYSFS_INCLUDE_DIR) message(STATUS "PhysFS will be provided by the bundled sources") endif() set(physfs_output_name "hwphysfs") add_subdirectory(misc/libphysfs) endif() -find_package_or_disable_msg(FFMPEG NOVIDEOREC "Video recording will not be built") +find_package_or_disable_msg(LIBAV NOVIDEOREC "Video recording will not be built") #physfs helper library add_subdirectory(misc/libphyslayer) -#server -if(NOT NOSERVER) - add_subdirectory(gameServer) +#maybe this could be merged inside hedgewars/CMakeLists.txt +if(BUILD_ENGINE_C) + #pascal to c converter + add_subdirectory(tools/pas2c) + add_subdirectory(project_files/hwc) +else() + #main pascal engine + add_subdirectory(hedgewars) endif() -#main engine -add_subdirectory(hedgewars) - #Android related build scripts +#TODO: when ANDROID, BUILD_ENGINE_LIBRARY should be set if(ANDROID) - #run cmake -DANDROID=1 to enable this add_subdirectory(project_files/Android-build) -endif() - -#TODO: when ANDROID, BUILD_ENGINE_LIBRARY should be set -if(NOT ANDROID) +else(ANDROID) add_subdirectory(bin) add_subdirectory(QTfrontend) add_subdirectory(share) add_subdirectory(tools) -endif() - +endif(ANDROID) include(${CMAKE_MODULE_PATH}/cpackvars.cmake) +enable_testing() + +add_custom_target(test_normal COMMAND ${CMAKE_CTEST_COMMAND} -E '^todo/' --timeout 300 --schedule-random) +add_custom_target(test_verbose COMMAND ${CMAKE_CTEST_COMMAND} -E '^todo/' --timeout 300 --schedule-random -V) + +set(LUATESTS_DIR "${CMAKE_SOURCE_DIR}/tests/lua") +set(TESTSDATA_DIR "${CMAKE_SOURCE_DIR}/share/hedgewars/Data") + +# set set this to "" if you want to see what's going on +# TODO: engine should do this implicitly when running tests, +# unless some env var like HWENGINE_SHOWTESTS is set or something +set(STATSONLYFLAG "--stats-only") + +# add all lua tests +file(GLOB_RECURSE luatests RELATIVE "${LUATESTS_DIR}" "${LUATESTS_DIR}/*.lua") +foreach(luatest ${luatests}) + add_test("${luatest}" "bin/hwengine" "--prefix" "${TESTSDATA_DIR}" "--nosound" "--nomusic" "${STATSONLYFLAG}" "--lua-test" "${LUATESTS_DIR}/${luatest}") +endforeach(luatest) +