diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake index 11af7a22..6db76a27 100644 --- a/cmake/findDependencies.cmake +++ b/cmake/findDependencies.cmake @@ -12,9 +12,9 @@ find_package(Threads REQUIRED) if(MINGW) find_package(PkgConfig REQUIRED) - pkg_check_modules(REGX REQUIRED regex) - if(REGX_FOUND) - include_directories(${REGX_INCLUDE_DIRS}) + pkg_check_modules(REGEX REQUIRED regex) + if(REGEX_FOUND) + include_directories(${REGEX_INCLUDE_DIRS}) endif() endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e83f12b4..a1fcf2a2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -261,7 +261,10 @@ else() if (CYGWIN OR MINGW) target_link_libraries( exiv2lib PRIVATE psapi ws2_32 ) - target_link_libraries( exiv2lib PRIVATE ${REGX_LIBRARIES} ) + endif() + + if (MINGW) + target_link_libraries( exiv2lib PRIVATE ${REGEX_LIBRARIES} ) endif() target_link_libraries( exiv2lib PRIVATE Threads::Threads) @@ -315,9 +318,9 @@ if(EXIV2_BUILD_EXIV2_COMMAND) if ( BUILD_SHARED_LIBS ) target_compile_definitions(exiv2 PRIVATE EXV_HAVE_DLL ) endif() - + if (MINGW) - target_link_libraries( exiv2 PRIVATE ${REGX_LIBRARIES} ) + target_link_libraries( exiv2 PRIVATE ${REGEX_LIBRARIES} ) endif() # modify source lists to suit environment