X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=CMakeLists.txt;h=0feb4b9cc98130dc2986e9b1596457988d1a2e2b;hb=d46a3cd0802e4a694165ef2da46d9e25558178ab;hp=6faa895eea13d36d2912f6deb2069854d700f081;hpb=ed3662c0852c4312a612b4fc35bd03aba8d13db7;p=lugaru.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 6faa895..0feb4b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ project(lugaru) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.0) cmake_policy(SET CMP0004 OLD) include(FindPkgConfig) @@ -27,9 +27,9 @@ set(CMAKE_CXX_FLAGS "-Wall -Wno-parentheses -pedantic --std=c++11 ${CMAKE_CXX_FL if(APPLE) set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Build architectures for OSX") - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value") - set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.10.sdk" CACHE PATH + set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.11.sdk" CACHE PATH "The product will be built against the headers and libraries located inside the indicated SDK.") endif(APPLE) @@ -37,7 +37,7 @@ if(LINUX) option(SYSTEM_INSTALL "Enable system-wide installation, with hardcoded data directory defined with CMAKE_INSTALL_DATADIR" OFF) endif(LINUX) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/Modules/") ### Sources @@ -173,7 +173,13 @@ else(WIN32) find_package(OpenAL REQUIRED) endif(WIN32) -find_package(sdl2 REQUIRED) +# macOS has problems with using pkgconfig to find SDL2 +if(APPLE) + find_package(sdl2 REQUIRED) +else(APPLE) + pkg_check_modules(SDL2 sdl2 REQUIRED) +endif(APPLE) + find_package(PNG REQUIRED) find_package(JPEG REQUIRED) find_package(ZLIB REQUIRED) @@ -282,7 +288,7 @@ endif(LINUX) if(APPLE) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lugaru DESTINATION ${LUGARU_BINDIR}) install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data DESTINATION ${LUGARU_APP_ROOT}) - install(FILES ${CMAKE_SOURCE_DIR}/Dist/OSX/lugaru.icns DESTINATION ${LUGARU_RESDIR}) + install(FILES ${CMAKE_SOURCE_DIR}/Dist/OSX/Lugaru.icns DESTINATION ${LUGARU_RESDIR}) install(FILES ${CMAKE_SOURCE_DIR}/Dist/OSX/Info.plist DESTINATION ${LUGARU_APP_ROOT}/Contents) endif(APPLE) @@ -291,6 +297,10 @@ endif(APPLE) install(FILES ${CMAKE_SOURCE_DIR}/AUTHORS ${CMAKE_SOURCE_DIR}/CONTENT-LICENSE.txt ${CMAKE_SOURCE_DIR}/COPYING.txt - ${CMAKE_SOURCE_DIR}/DEVTOOLS.txt ${CMAKE_SOURCE_DIR}/README.md + ${CMAKE_SOURCE_DIR}/RELEASE-NOTES.md + ${CMAKE_SOURCE_DIR}/Docs/DEVTOOLS.txt + ${CMAKE_SOURCE_DIR}/Docs/README.Empire.txt + ${CMAKE_SOURCE_DIR}/Docs/README.SevenTasks.txt + ${CMAKE_SOURCE_DIR}/Docs/README.Temple.txt DESTINATION ${LUGARU_DOCDIR})