diff -r c07f341adad9 -r bb95e351270c CMakeLists.txt --- a/CMakeLists.txt Mon Jun 17 23:24:18 2013 +0200 +++ b/CMakeLists.txt Tue Jun 18 09:48:10 2013 +0200 @@ -104,7 +104,7 @@ if(${allow_parse_args}) separate_arguments(ghflags_parsed UNIX_COMMAND ${GHFLAGS}) else() - message(${WARNING} "FPFLAGS and GHFLAGS are available only when using CMake >= 2.8") + message("*** FPFLAGS and GHFLAGS are available only when using CMake >= 2.8 ***") endif() endif() @@ -124,6 +124,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 @@ -136,7 +137,7 @@ find_package(Clang) # Check LLVM/Clang version if(CLANG_VERSION VERSION_LESS required_clang_version) - message(FATAL_ERROR "LLVM/Clang compiler required version is ${required_clang_version} but version ${CLANG_VERSION} was found!") + message(FATAL_ERROR "LLVM/Clang compiler required version is ${required_clang_version} but version ${CLANG_VERSION} was found!") else() message(STATUS "Found CLANG: ${CLANG_EXECUTABLE} (version ${CLANG_VERSION})") endif() @@ -214,9 +215,12 @@ #physfs helper library add_subdirectory(misc/libphyslayer) +if(NOT BUILD_ENGINE_LIBRARY AND APPLE) + add_subdirectory(hedgewars/sdlmain) +endif() + #TODO: nowadays this could be merged inside hedgewars/CMakeLists.txt if(NOPASCAL) - add_subdirectory(hedgewars/sdlmain) #pascal to c converter add_subdirectory(tools/pas2c) add_subdirectory(project_files/hwc) @@ -229,7 +233,7 @@ #WEBGL deps else(WEBGL) #Android related build scripts - #TODO: when ANDROID, LIBENGINE should be set + #TODO: when ANDROID, BUILD_ENGINE_LIBRARY should be set if(ANDROID) add_subdirectory(project_files/Android-build) else(ANDROID)