aboutsummaryrefslogtreecommitdiff
path: root/ports/libpopt
diff options
context:
space:
mode:
authorJackBoosY <yuzaiyang@beyondsoft.com>2020-01-13 23:55:59 -0800
committerJackBoosY <yuzaiyang@beyondsoft.com>2020-01-13 23:55:59 -0800
commit2514481b42ebdeec28649582fc666955cf206c84 (patch)
tree60c9809a5c3c8adbad240a40b1088a6f8e42c019 /ports/libpopt
parentb751326c91c9a307aaf5e340b61ab9f2d1ad45a4 (diff)
parent28eee51adb36f2165be846e77ef7b3ee5b3f8789 (diff)
downloadvcpkg-2514481b42ebdeec28649582fc666955cf206c84.tar.gz
vcpkg-2514481b42ebdeec28649582fc666955cf206c84.zip
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/jack/upgrade_libi
Diffstat (limited to 'ports/libpopt')
-rw-r--r--ports/libpopt/CMakeLists.txt4
-rw-r--r--ports/libpopt/CONTROL2
2 files changed, 4 insertions, 2 deletions
diff --git a/ports/libpopt/CMakeLists.txt b/ports/libpopt/CMakeLists.txt
index 84afc160d..5348757b4 100644
--- a/ports/libpopt/CMakeLists.txt
+++ b/ports/libpopt/CMakeLists.txt
@@ -46,7 +46,9 @@ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
include_directories(${CMAKE_BINARY_DIR})
add_library(popt ${SOURCES})
-set_target_properties(popt PROPERTIES COMPILE_FLAGS "/wd4996")
+if (MSVC)
+ target_compile_options(popt PRIVATE /wd4996)
+endif()
install(TARGETS popt
RUNTIME DESTINATION bin
diff --git a/ports/libpopt/CONTROL b/ports/libpopt/CONTROL
index 70cf3dae9..03cd3e374 100644
--- a/ports/libpopt/CONTROL
+++ b/ports/libpopt/CONTROL
@@ -1,3 +1,3 @@
Source: libpopt
-Version: 1.16-11
+Version: 1.16-12
Description: Library for parsing command line parameters