Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move thirdparty part in CMakeLists root to thirdparty CMakeLists #1800

Merged
merged 2 commits into from
Feb 4, 2023
Merged

Move thirdparty part in CMakeLists root to thirdparty CMakeLists #1800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aaf7107
Move thirdparty part in CMakeLists root to thirdparty CMakeLists
ZehMatt Feb 2, 2023
b76b19d
Re-order include part a bit, add comments
ZehMatt Feb 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 8 additions & 33 deletions CMakeLists.txt
View file
Open in desktop
Expand Up @@ -69,44 +69,20 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH}")
set(DEBUG_LEVEL 0 CACHE STRING "Select debug level for compilation. Use value in range 0–3.")
list(APPEND COMMON_COMPILE_OPTIONS -DDEBUG=${DEBUG_LEVEL})

# Display source files nicely in IDEs
set_property(GLOBAL PROPERTY USE_FOLDERS ON)

# System dependencies
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
if (${OPENLOCO_BUILD_TESTS})
find_package(GTest REQUIRED)
enable_testing()
endif()
find_package(SDL2 REQUIRED CONFIG)
if (TARGET SDL2::SDL2-static)
set(SDL2_LIB SDL2::SDL2-static)
elseif (TARGET SDL2::SDL2)
set(SDL2_LIB SDL2::SDL2)
else ()
# Even though we asked for SDL2 from a configure mode which would have SDL2 targets
# it appears we have been given a raw module mode SDL2 so create a wrapper library
# then we can treat it just like a normal configure mode target
add_library(SDL2_WRAPPER INTERFACE)
target_link_libraries(SDL2_WRAPPER INTERFACE ${SDL2_LIBRARIES})
target_include_directories(SDL2_WRAPPER INTERFACE ${SDL2_INCLUDE_DIRS})
set(SDL2_LIB SDL2_WRAPPER)
endif()

ZehMatt marked this conversation as resolved.
Show resolved Hide resolved
find_package(PNG REQUIRED)
if (NOT APPLE AND NOT MSVC)
pkg_check_modules(OPENAL REQUIRED openal)
else()
find_package(OpenAL CONFIG REQUIRED)
set(OPENAL_LIBRARIES OpenAL::OpenAL)
endif()
# Thirdparty dependencies
include(thirdparty/CMakeLists.txt)

# breakpad is also required
if (MSVC)
find_package(unofficial-breakpad CONFIG REQUIRED)
set(BREAKPAD_LIBRARIES unofficial::breakpad::libbreakpad unofficial::breakpad::libbreakpad_client)
if (${OPENLOCO_BUILD_TESTS})
enable_testing()
endif()

# Display source files nicely in IDEs
set_property(GLOBAL PROPERTY USE_FOLDERS ON)

# Handle creating the rct2 text and data files on OS X and Linux
if (UNIX)
set(OBJ_FORMAT "elf32-i386")
Expand Down Expand Up @@ -159,7 +135,6 @@ if (UNIX)
endif ()
endif()

include(thirdparty/CMakeLists.txt)
add_subdirectory(src)

if (MSVC)
Expand Down
33 changes: 33 additions & 0 deletions thirdparty/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -38,3 +38,36 @@ if ( NOT span-lite_FOUND )
# Group all the ThirdParty items under a ThirdParty folder in IDEs
set_target_properties(span-lite PROPERTIES FOLDER "ThirdParty")
endif()

if (${OPENLOCO_BUILD_TESTS})
find_package(GTest REQUIRED)
endif()

find_package(SDL2 REQUIRED CONFIG)
if (TARGET SDL2::SDL2-static)
set(SDL2_LIB SDL2::SDL2-static)
elseif (TARGET SDL2::SDL2)
set(SDL2_LIB SDL2::SDL2)
else ()
# Even though we asked for SDL2 from a configure mode which would have SDL2 targets
# it appears we have been given a raw module mode SDL2 so create a wrapper library
# then we can treat it just like a normal configure mode target
add_library(SDL2_WRAPPER INTERFACE)
target_link_libraries(SDL2_WRAPPER INTERFACE ${SDL2_LIBRARIES})
target_include_directories(SDL2_WRAPPER INTERFACE ${SDL2_INCLUDE_DIRS})
set(SDL2_LIB SDL2_WRAPPER)
endif()

find_package(PNG REQUIRED)
if (NOT APPLE AND NOT MSVC)
pkg_check_modules(OPENAL REQUIRED openal)
else()
find_package(OpenAL CONFIG REQUIRED)
set(OPENAL_LIBRARIES OpenAL::OpenAL)
endif()

# breakpad is also required
if (MSVC)
find_package(unofficial-breakpad CONFIG REQUIRED)
set(BREAKPAD_LIBRARIES unofficial::breakpad::libbreakpad unofficial::breakpad::libbreakpad_client)
endif()