Skip to content

Commit

Permalink
remove filesystem linking
Browse files Browse the repository at this point in the history
GCC and Clang greater than 8 don't need this. Remove it.

Signed-off-by: Rosen Penev <[email protected]>
  • Loading branch information
neheb committed Jan 24, 2025
1 parent d16d003 commit f808a33
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 266 deletions.
2 changes: 0 additions & 2 deletions app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ if(EXIV2_ENABLE_NLS)
target_include_directories(exiv2 PRIVATE ${Intl_INCLUDE_DIRS})
endif()

target_link_libraries(exiv2 PRIVATE std::filesystem)

if(USING_CONAN
AND WIN32
AND EXISTS ${PROJECT_BINARY_DIR}/conanDlls
Expand Down
249 changes: 0 additions & 249 deletions cmake/FindFilesystem.cmake

This file was deleted.

4 changes: 0 additions & 4 deletions cmake/findDependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ if(BUILD_TESTING)
endif()
endif()

if(EXIV2_ENABLE_FILESYSTEM_ACCESS)
find_package(Filesystem COMPONENTS Experimental Final REQUIRED)
endif()

# don't use Frameworks on the Mac (#966)
if (APPLE)
set(CMAKE_FIND_FRAMEWORK NEVER)
Expand Down
2 changes: 1 addition & 1 deletion fuzz/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ macro(FUZZER name)
else()
set_target_properties(${name} PROPERTIES COMPILE_FLAGS "-fsanitize=fuzzer" LINK_FLAGS "-fsanitize=fuzzer")
endif()
target_link_libraries(${name} PRIVATE exiv2lib std::filesystem)
target_link_libraries(${name} PRIVATE exiv2lib)
endmacro()

FUZZER(fuzz-read-print-write)
8 changes: 0 additions & 8 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,6 @@ if not cpp.has_header_symbol('format', 'std::format')
deps += dependency('fmt')
endif

if cpp.get_argument_syntax() == 'gcc' and cpp.version().version_compare('<9')
if host_machine.system() == 'linux' and cpp.get_define('_LIBCPP_VERSION', prefix: '#include <new>') == ''
deps += cpp.find_library('stdc++fs')
elif cpp.get_id() == 'clang'
deps += cpp.find_library('c++fs')
endif
endif

brotli_dep = dependency('libbrotlidec', disabler: true, required: false)
if brotli_dep.found()
deps += brotli_dep
Expand Down
2 changes: 1 addition & 1 deletion samples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ foreach(application ${APPLICATIONS})
target_sources(${application} PRIVATE ${PROJECT_SOURCE_DIR}/app/utf8.rc)
endif()
endif()
target_link_libraries(${application} PRIVATE exiv2lib std::filesystem)
target_link_libraries(${application} PRIVATE exiv2lib)
if(EXIV2_ENABLE_PNG)
target_link_libraries(${application} PRIVATE ${ZLIB_LIBRARIES})
if(MSVC)
Expand Down
2 changes: 1 addition & 1 deletion unitTests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ add_executable(

target_compile_definitions(unit_tests PRIVATE exiv2lib_STATIC TESTDATA_PATH="${PROJECT_SOURCE_DIR}/test/data")

target_link_libraries(unit_tests PRIVATE exiv2lib GTest::gmock_main std::filesystem)
target_link_libraries(unit_tests PRIVATE exiv2lib GTest::gmock_main)

if(NOT EXV_HAVE_STD_FORMAT)
target_link_libraries(unit_tests PRIVATE fmt::fmt)
Expand Down

0 comments on commit f808a33

Please sign in to comment.