aboutsummaryrefslogtreecommitdiff
path: root/ports/jansson
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-03-11 23:41:51 -0700
committerRobert Schumacher <roschuma@microsoft.com>2018-03-11 23:42:54 -0700
commit9f9778ccff48981a691bf34f30ecc4bf2efd5ac1 (patch)
tree10ec609d13836ddc266345f441bae6f9e824056a /ports/jansson
parentece289b9a6466dca885fd2555ed783d70dcad9bf (diff)
downloadvcpkg-9f9778ccff48981a691bf34f30ecc4bf2efd5ac1.tar.gz
vcpkg-9f9778ccff48981a691bf34f30ecc4bf2efd5ac1.zip
[many ports] Improve behavior on Linux and general cleanup
Diffstat (limited to 'ports/jansson')
-rw-r--r--ports/jansson/CONTROL2
-rw-r--r--ports/jansson/portfile.cmake16
2 files changed, 10 insertions, 8 deletions
diff --git a/ports/jansson/CONTROL b/ports/jansson/CONTROL
index d5fa4f546..6050b464d 100644
--- a/ports/jansson/CONTROL
+++ b/ports/jansson/CONTROL
@@ -1,3 +1,3 @@
Source: jansson
-Version: 2.11
+Version: 2.11-2
Description: Jansson is a C library for encoding, decoding and manipulating JSON data
diff --git a/ports/jansson/portfile.cmake b/ports/jansson/portfile.cmake
index 034b4eb01..e243422fb 100644
--- a/ports/jansson/portfile.cmake
+++ b/ports/jansson/portfile.cmake
@@ -33,15 +33,17 @@ vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
- -DJANSSON_STATIC_CRT=${JANSSON_STATIC_CRT}
- -DJANSSON_EXAMPLES=OFF
- -DJANSSON_WITHOUT_TESTS=ON
- -DJANSSON_BUILD_SHARED_LIBS=${JANSSON_BUILD_SHARED_LIBS}
- -DUSE_WINDOWS_CRYPTOAPI=${USE_WINDOWS_CRYPTOAPI}
+ -DJANSSON_STATIC_CRT=${JANSSON_STATIC_CRT}
+ -DJANSSON_EXAMPLES=OFF
+ -DJANSSON_WITHOUT_TESTS=ON
+ -DJANSSON_BUILD_SHARED_LIBS=${JANSSON_BUILD_SHARED_LIBS}
+ -DUSE_WINDOWS_CRYPTOAPI=${USE_WINDOWS_CRYPTOAPI}
+ -DJANSSON_INSTALL_CMAKE_DIR:STRING=share/jansson
)
-vcpkg_install_cmake(DISABLE_PARALLEL)
-vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/jansson)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/jansson RENAME copyright)