diff options
| author | atkawa7 <atkawa7@yahoo.com> | 2017-06-20 09:45:11 -0700 |
|---|---|---|
| committer | atkawa7 <atkawa7@yahoo.com> | 2017-06-20 09:45:11 -0700 |
| commit | 4e41db458c0d9471e7997b4d50b38d77fe8c872e (patch) | |
| tree | 154539bf60669dd41283e5257fee2e34ba7c9eae | |
| parent | 3c80824f8586902a39a411e19135dbabc16a7835 (diff) | |
| download | vcpkg-4e41db458c0d9471e7997b4d50b38d77fe8c872e.tar.gz vcpkg-4e41db458c0d9471e7997b4d50b38d77fe8c872e.zip | |
Fixes VCPKG_CRT_LINKAGE, Turned off tests, Added VCPKG_LIBRARY_LINKAGE
| -rw-r--r-- | ports/jansson/portfile.cmake | 31 |
1 files 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() |