Fixing typo in cmakefiles and removing REGEX dependencie for Cygwin

v0.27.3
Hombre 7 years ago committed by Luis Díaz Más
parent 28da26f174
commit a226d6a650

@ -12,9 +12,9 @@ find_package(Threads REQUIRED)
if(MINGW) if(MINGW)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(REGX REQUIRED regex) pkg_check_modules(REGEX REQUIRED regex)
if(REGX_FOUND) if(REGEX_FOUND)
include_directories(${REGX_INCLUDE_DIRS}) include_directories(${REGEX_INCLUDE_DIRS})
endif() endif()
endif() endif()

@ -261,7 +261,10 @@ else()
if (CYGWIN OR MINGW) if (CYGWIN OR MINGW)
target_link_libraries( exiv2lib PRIVATE psapi ws2_32 ) 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() endif()
target_link_libraries( exiv2lib PRIVATE Threads::Threads) target_link_libraries( exiv2lib PRIVATE Threads::Threads)
@ -315,9 +318,9 @@ if(EXIV2_BUILD_EXIV2_COMMAND)
if ( BUILD_SHARED_LIBS ) if ( BUILD_SHARED_LIBS )
target_compile_definitions(exiv2 PRIVATE EXV_HAVE_DLL ) target_compile_definitions(exiv2 PRIVATE EXV_HAVE_DLL )
endif() endif()
if (MINGW) if (MINGW)
target_link_libraries( exiv2 PRIVATE ${REGX_LIBRARIES} ) target_link_libraries( exiv2 PRIVATE ${REGEX_LIBRARIES} )
endif() endif()
# modify source lists to suit environment # modify source lists to suit environment

Loading…
Cancel
Save