|
 |
f68f66 |
From e57f311e629762fbf2b08d9a5b1e0cad1035b42f Mon Sep 17 00:00:00 2001
|
|
|
f68f66 |
From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
|
|
|
f68f66 |
Date: Tue, 18 Dec 2018 10:33:11 +0100
|
|
|
f68f66 |
Subject: [PATCH 35/70] cmake: ignore warnings about missing PDB files in 3rd
|
|
|
f68f66 |
party libs
|
|
|
f68f66 |
|
|
|
f68f66 |
---
|
|
|
f68f66 |
samples/CMakeLists.txt | 11 +++++++++++
|
|
|
f68f66 |
src/CMakeLists.txt | 4 ++++
|
|
|
f68f66 |
2 files changed, 15 insertions(+)
|
|
|
f68f66 |
|
|
|
f68f66 |
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
|
|
|
f68f66 |
index a3e491e0..4e8c14c6 100644
|
|
|
f68f66 |
--- a/samples/CMakeLists.txt
|
|
|
f68f66 |
+++ b/samples/CMakeLists.txt
|
|
|
f68f66 |
@@ -43,6 +43,9 @@ foreach(entry ${SAMPLES})
|
|
|
f68f66 |
add_test( ${target}_test ${target} )
|
|
|
f68f66 |
target_include_directories(${target} PRIVATE ${CMAKE_SOURCE_DIR}/src) # To find unused.h
|
|
|
f68f66 |
install( TARGETS ${target} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
|
f68f66 |
+ if (MSVC)
|
|
|
f68f66 |
+ set_target_properties(${target} PROPERTIES LINK_FLAGS "/ignore:4099")
|
|
|
f68f66 |
+ endif()
|
|
|
f68f66 |
endforeach()
|
|
|
f68f66 |
|
|
|
f68f66 |
###################################
|
|
|
f68f66 |
@@ -69,6 +72,11 @@ list(APPEND APPLICATIONS exiv2json)
|
|
|
f68f66 |
|
|
|
f68f66 |
install( TARGETS metacopy pathtest exiv2json RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
|
f68f66 |
|
|
|
f68f66 |
+if (MSVC)
|
|
|
f68f66 |
+ set_target_properties(exiv2json PROPERTIES LINK_FLAGS "/ignore:4099")
|
|
|
f68f66 |
+ set_target_properties(metacopy PROPERTIES LINK_FLAGS "/ignore:4099")
|
|
|
f68f66 |
+endif()
|
|
|
f68f66 |
+
|
|
|
f68f66 |
if( EXPAT_FOUND )
|
|
|
f68f66 |
add_executable( geotag geotag.cpp)
|
|
|
f68f66 |
list(APPEND APPLICATIONS geotag)
|
|
|
f68f66 |
@@ -103,6 +111,9 @@ foreach(application ${APPLICATIONS})
|
|
|
f68f66 |
if( EXIV2_ENABLE_PNG )
|
|
|
f68f66 |
target_link_libraries( ${application} PRIVATE ${ZLIB_LIBRARIES} )
|
|
|
f68f66 |
endif()
|
|
|
f68f66 |
+ if (MSVC)
|
|
|
f68f66 |
+ set_target_properties(${application} PROPERTIES LINK_FLAGS "/ignore:4099")
|
|
|
f68f66 |
+ endif()
|
|
|
f68f66 |
endforeach()
|
|
|
f68f66 |
|
|
|
f68f66 |
# ******************************************************************************
|
|
|
f68f66 |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
|
f68f66 |
index 0d093924..adb285b1 100644
|
|
|
f68f66 |
--- a/src/CMakeLists.txt
|
|
|
f68f66 |
+++ b/src/CMakeLists.txt
|
|
|
f68f66 |
@@ -274,5 +274,9 @@ if(EXIV2_BUILD_EXIV2_COMMAND)
|
|
|
f68f66 |
|
|
|
f68f66 |
install(TARGETS exiv2 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
|
f68f66 |
install( FILES exiv2.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 )
|
|
|
f68f66 |
+
|
|
|
f68f66 |
+ if (MSVC)
|
|
|
f68f66 |
+ set_target_properties(exiv2 PROPERTIES LINK_FLAGS "/ignore:4099")
|
|
|
f68f66 |
+ endif()
|
|
|
f68f66 |
endif()
|
|
|
f68f66 |
|
|
|
f68f66 |
--
|
|
|
f68f66 |
2.17.2
|
|
|
f68f66 |
|