# HG changeset patch # User koda # Date 1389979067 -3600 # Node ID b8b91c7e0da8ebfd802976d2720ee0d059d9395e # Parent c28e4db7cca95850d2f9bcc8edfb28c78b00dca6 drop redundancies for lua and physfs diff -r c28e4db7cca9 -r b8b91c7e0da8 CMakeLists.txt --- a/CMakeLists.txt Fri Jan 17 18:04:49 2014 +0100 +++ b/CMakeLists.txt Fri Jan 17 18:17:47 2014 +0100 @@ -125,7 +125,6 @@ endif() if(LUA_LIBRARY AND LUA_INCLUDE_DIR) - set(LUA_FOUND TRUE) #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}) @@ -164,7 +163,6 @@ endif() if(PHYSFS_LIBRARY AND PHYSFS_INCLUDE_DIR) - set(PHYSFS_FOUND TRUE) #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}) diff -r c28e4db7cca9 -r b8b91c7e0da8 hedgewars/CMakeLists.txt --- a/hedgewars/CMakeLists.txt Fri Jan 17 18:04:49 2014 +0100 +++ b/hedgewars/CMakeLists.txt Fri Jan 17 18:17:47 2014 +0100 @@ -137,7 +137,7 @@ add_definitions(-dPNG_SCREENSHOTS) endif() -if(LUA_FOUND AND LUA_SYSTEM) +if(LUA_SYSTEM) get_filename_component(LUA_LIBRARY_DIR ${LUA_LIBRARY} PATH) get_filename_component(LUA_LIBRARY_NAME ${LUA_LIBRARY} NAME) #NAME_WE would strip the .1 (or .2) next to the ".so" @@ -149,7 +149,7 @@ add_flag_append(CMAKE_Pascal_FLAGS "-XLAlua=${lua_output_name}") endif() -if(PHYSFS_FOUND AND PHYSFS_SYSTEM) +if(PHYSFS_SYSTEM) get_filename_component(PHYSFS_LIBRARY_DIR ${PHYSFS_LIBRARY} PATH) add_flag_append(CMAKE_Pascal_FLAGS "-Fl${PHYSFS_LIBRARY}") else()