# HG changeset patch # User koda # Date 1389220170 -3600 # Node ID c18c66d621e5846748a10bc622680df3d7e4e97a # Parent 1a42d36f346a31267d705ef9fec5b6f550d7448f consistent cmake checks diff -r 1a42d36f346a -r c18c66d621e5 CMakeLists.txt --- a/CMakeLists.txt Wed Jan 08 19:19:09 2014 +0100 +++ b/CMakeLists.txt Wed Jan 08 23:29:30 2014 +0100 @@ -114,7 +114,7 @@ #lua discovery -if (${LUA_SYSTEM}) +if (LUA_SYSTEM) if (NOT LUA_LIBRARY OR NOT LUA_INCLUDE_DIR) find_package(Lua) endif() @@ -137,7 +137,7 @@ #physfs discovery -if (${PHYSFS_SYSTEM}) +if (PHYSFS_SYSTEM) if (NOT PHYSFS_LIBRARY OR NOT PHYSFS_INCLUDE_DIR) find_package(PhysFS) endif() diff -r 1a42d36f346a -r c18c66d621e5 QTfrontend/CMakeLists.txt --- a/QTfrontend/CMakeLists.txt Wed Jan 08 19:19:09 2014 +0100 +++ b/QTfrontend/CMakeLists.txt Wed Jan 08 23:29:30 2014 +0100 @@ -152,7 +152,7 @@ set(hwfr_rez hedgewars.qrc) -if(${BUILD_ENGINE_LIBRARY}) +if(BUILD_ENGINE_LIBRARY) add_definitions(-DHWLIBRARY=1) set(hwlibname "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}hwengine${CMAKE_SHARED_LIBRARY_SUFFIX}") list(APPEND HW_LINK_LIBS ${hwlibname}) diff -r 1a42d36f346a -r c18c66d621e5 hedgewars/CMakeLists.txt --- a/hedgewars/CMakeLists.txt Wed Jan 08 19:19:09 2014 +0100 +++ b/hedgewars/CMakeLists.txt Wed Jan 08 23:29:30 2014 +0100 @@ -106,7 +106,7 @@ add_flag_append(CMAKE_Pascal_FLAGS "-Fl${LIBRARY_OUTPUT_PATH}") #DEPENDECIES AND EXECUTABLES SECTION -if(NOT ${BUILD_ENGINE_LIBRARY} AND APPLE) +if(APPLE AND (NOT BUILD_ENGINE_LIBRARY)) #on OSX we need to provide the SDL_main() function when building as executable add_subdirectory(sdlmain) list(APPEND HW_LINK_LIBS SDLmain) diff -r 1a42d36f346a -r c18c66d621e5 tools/CMakeLists.txt --- a/tools/CMakeLists.txt Wed Jan 08 19:19:09 2014 +0100 +++ b/tools/CMakeLists.txt Wed Jan 08 23:29:30 2014 +0100 @@ -17,7 +17,7 @@ if(NOT NOAUTOUPDATE) find_package(Sparkle) #needed for SPARKLE_FOUND variable #needed because the 'if' clause in the script prints silly policy warnings - if(${SPARKLE_FOUND}) + if(SPARKLE_FOUND) set(SPARKLE_FOUND 1) else() set(SPARKLE_FOUND 0)