From 9a8e5be8ee312aaf7b38afaa9745a9d07ac91266 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 23 Mar 2019 09:25:56 +0100 Subject: [PATCH] Fix filesystem on gcc < 9.0 --- .travis.yml | 1 + Minetestmapper/CMakeLists.txt | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 551310a..6d76335 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +dist: xenial language: cpp compiler: - gcc diff --git a/Minetestmapper/CMakeLists.txt b/Minetestmapper/CMakeLists.txt index 97eb204..0aace64 100644 --- a/Minetestmapper/CMakeLists.txt +++ b/Minetestmapper/CMakeLists.txt @@ -80,11 +80,10 @@ target_include_directories(Minetestmapper PRIVATE ${LIBGD_INCLUDE_DIR}) if(UNIX) find_package(PNG REQUIRED) find_package(Threads REQUIRED) - find_library(fs_LIBRARY NAMES stdc++fs) - if(fs_LIBRARY) - target_link_libraries(Minetestmapper fs_LIBRARY) - endif() + target_link_libraries(Minetestmapper PNG::PNG Threads::Threads ${CMAKE_DL_LIBS}) + + target_link_libraries(Minetestmapper $<$,$,9.0>>:stdc++fs>) endif() # Optional Libraries