diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-10-15 15:24:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-15 15:24:30 +0200 |
| commit | c089f9b59f32780d3228d08c2d2eeb95e4ace9e1 (patch) | |
| tree | b31f8869425be0d16363b5fb461719dbf1826308 /CMakeLists.txt | |
| parent | 924c1634d35e4e10222d12cb69ec11dd8b8af8ac (diff) | |
| parent | 03d077e915cf2bf06474b17e51e0c664f57eb348 (diff) | |
| download | PrismLauncher-c089f9b59f32780d3228d08c2d2eeb95e4ace9e1.tar.gz PrismLauncher-c089f9b59f32780d3228d08c2d2eeb95e4ace9e1.tar.bz2 PrismLauncher-c089f9b59f32780d3228d08c2d2eeb95e4ace9e1.zip | |
Merge pull request #1203 from DioEgizio/macos-legacy
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 46192414..310cec59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,9 +33,6 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_C_STANDARD 11) include(GenerateExportHeader) set(CMAKE_CXX_FLAGS "-Wall -pedantic -fstack-protector-strong --param=ssp-buffer-size=4 ${CMAKE_CXX_FLAGS}") -if(UNIX AND APPLE) - set(CMAKE_CXX_FLAGS "-stdlib=libc++ ${CMAKE_CXX_FLAGS}") -endif() # Fix build with Qt 5.13 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_DEPRECATED_WARNINGS=Y") @@ -192,9 +189,12 @@ if (Qt5_POSITION_INDEPENDENT_CODE) SET(CMAKE_POSITION_INDEPENDENT_CODE ON) endif() -# Find toml++ if(NOT Launcher_FORCE_BUNDLED_LIBS) + # Find toml++ find_package(tomlplusplus 3.2.0 QUIET) + + # Find ghc_filesystem + find_package(ghc_filesystem QUIET) endif() ####################################### Program Info ####################################### @@ -326,6 +326,14 @@ endif() add_subdirectory(libraries/katabasis) # An OAuth2 library that tried to do too much add_subdirectory(libraries/gamemode) add_subdirectory(libraries/murmur2) # Hash for usage with the CurseForge API +if (NOT ghc_filesystem_FOUND) + message(STATUS "Using bundled ghc_filesystem") + set(GHC_FILESYSTEM_WITH_INSTALL OFF) # Workaround ghc::filesystem bug + add_subdirectory(libraries/filesystem) # Implementation of std::filesystem for old C++, for usage in old macOS + add_library(ghcFilesystem::ghc_filesystem ALIAS ghc_filesystem) +else() + message(STATUS "Using system ghc_filesystem") +endif() ############################### Built Artifacts ############################### |