From 3c80824f8586902a39a411e19135dbabc16a7835 Mon Sep 17 00:00:00 2001 From: atkawa7 Date: Fri, 16 Jun 2017 12:00:00 -0700 Subject: [jansson] new port required by #1122 --- ports/jansson/CONTROL | 3 +++ ports/jansson/portfile.cmake | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 ports/jansson/CONTROL create mode 100644 ports/jansson/portfile.cmake diff --git a/ports/jansson/CONTROL b/ports/jansson/CONTROL new file mode 100644 index 000000000..c14e7d7d8 --- /dev/null +++ b/ports/jansson/CONTROL @@ -0,0 +1,3 @@ +Source: jansson +Version: v2.10 +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 new file mode 100644 index 000000000..33dc9021c --- /dev/null +++ b/ports/jansson/portfile.cmake @@ -0,0 +1,41 @@ +include(vcpkg_common_functions) + + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO akheron/jansson + REF v2.10 + SHA512 0859c8a29c1cb7e406d3eb369285500e98ee23677e3a6af6cd81511c57a6aa8dbabe4a8c7b673a3000203b68f74d84786817aec76cb1e85af217268159bda4b6 + HEAD_REF master +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(JANSSON_STATIC_CRT ON) +else() + set(JANSSON_STATIC_CRT OFF) +endif() + + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DJANSSON_STATIC_CRT=${JANSSON_STATIC_CRT} + -DJANSSON_EXAMPLES=OFF + -DJANSSON_WITHOUT_TESTS=OFF + -DJANSSON_BUILD_SHARED_LIBS=ON +) + + +vcpkg_install_cmake(DISABLE_PARALLEL) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/jansson RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + + +vcpkg_copy_pdbs() -- cgit v1.2.3 From 4e41db458c0d9471e7997b4d50b38d77fe8c872e Mon Sep 17 00:00:00 2001 From: atkawa7 Date: Tue, 20 Jun 2017 09:45:11 -0700 Subject: Fixes VCPKG_CRT_LINKAGE, Turned off tests, Added VCPKG_LIBRARY_LINKAGE --- ports/jansson/portfile.cmake | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/ports/jansson/portfile.cmake b/ports/jansson/portfile.cmake index 33dc9021c..412d295b7 100644 --- a/ports/jansson/portfile.cmake +++ b/ports/jansson/portfile.cmake @@ -1,12 +1,11 @@ include(vcpkg_common_functions) - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO akheron/jansson - REF v2.10 - SHA512 0859c8a29c1cb7e406d3eb369285500e98ee23677e3a6af6cd81511c57a6aa8dbabe4a8c7b673a3000203b68f74d84786817aec76cb1e85af217268159bda4b6 - HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + REPO akheron/jansson + REF v2.10 + SHA512 0859c8a29c1cb7e406d3eb369285500e98ee23677e3a6af6cd81511c57a6aa8dbabe4a8c7b673a3000203b68f74d84786817aec76cb1e85af217268159bda4b6 + HEAD_REF master ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -16,13 +15,19 @@ else() endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(JANSSON_BUILD_SHARED_LIBS ON) +else() + set(JANSSON_BUILD_SHARED_LIBS OFF) +endif() + vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -DJANSSON_STATIC_CRT=${JANSSON_STATIC_CRT} + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DJANSSON_STATIC_CRT=${JANSSON_STATIC_CRT} -DJANSSON_EXAMPLES=OFF - -DJANSSON_WITHOUT_TESTS=OFF - -DJANSSON_BUILD_SHARED_LIBS=ON + -DJANSSON_WITHOUT_TESTS=ON + -DJANSSON_BUILD_SHARED_LIBS=${JANSSON_BUILD_SHARED_LIBS} ) @@ -33,8 +38,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +if(VCPKG_CRT_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() -- cgit v1.2.3 From e4e2d27ee90456b674171df1fb3daf6ff2b894aa Mon Sep 17 00:00:00 2001 From: atkawa7 Date: Tue, 20 Jun 2017 09:50:46 -0700 Subject: fixes VCPKG_CRT_LINKAGE --- ports/jansson/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/jansson/portfile.cmake b/ports/jansson/portfile.cmake index 412d295b7..c5409bec2 100644 --- a/ports/jansson/portfile.cmake +++ b/ports/jansson/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_github( HEAD_REF master ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") +if(VCPKG_CRT_LINKAGE STREQUAL static) set(JANSSON_STATIC_CRT ON) else() set(JANSSON_STATIC_CRT OFF) -- cgit v1.2.3 From 833c38c6307e8e34bcf578fc7e24b29228f35928 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 20 Jun 2017 16:19:36 -0700 Subject: [jansson] Enable cmake scripts --- ports/jansson/portfile.cmake | 11 ++--------- scripts/cmake/vcpkg_fixup_cmake_targets.cmake | 4 ++++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ports/jansson/portfile.cmake b/ports/jansson/portfile.cmake index c5409bec2..50d5a994e 100644 --- a/ports/jansson/portfile.cmake +++ b/ports/jansson/portfile.cmake @@ -30,17 +30,10 @@ vcpkg_configure_cmake( -DJANSSON_BUILD_SHARED_LIBS=${JANSSON_BUILD_SHARED_LIBS} ) - vcpkg_install_cmake(DISABLE_PARALLEL) +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/jansson RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake) - -if(VCPKG_CRT_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() - +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/jansson RENAME copyright) vcpkg_copy_pdbs() diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake index 3b0c794d9..5f96c4b26 100644 --- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake +++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake @@ -16,6 +16,10 @@ function(vcpkg_fixup_cmake_targets) cmake_parse_arguments(_vfct "" "CONFIG_PATH" "" ${ARGN}) + if(_vfct_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "vcpkg_fixup_cmake_targets was passed extra arguments: ${_vfct_UNPARSED_ARGUMENTS}") + endif() + set(DEBUG_SHARE ${CURRENT_PACKAGES_DIR}/debug/share/${PORT}) set(RELEASE_SHARE ${CURRENT_PACKAGES_DIR}/share/${PORT}) -- cgit v1.2.3