mirror of
https://github.com/cemu-project/vcpkg.git
synced 2025-02-23 11:07:10 +01:00
Fixes VCPKG_CRT_LINKAGE, Turned off tests, Added VCPKG_LIBRARY_LINKAGE
This commit is contained in:
parent
3c80824f85
commit
4e41db458c
@ -1,12 +1,11 @@
|
|||||||
include(vcpkg_common_functions)
|
include(vcpkg_common_functions)
|
||||||
|
|
||||||
|
|
||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO akheron/jansson
|
REPO akheron/jansson
|
||||||
REF v2.10
|
REF v2.10
|
||||||
SHA512 0859c8a29c1cb7e406d3eb369285500e98ee23677e3a6af6cd81511c57a6aa8dbabe4a8c7b673a3000203b68f74d84786817aec76cb1e85af217268159bda4b6
|
SHA512 0859c8a29c1cb7e406d3eb369285500e98ee23677e3a6af6cd81511c57a6aa8dbabe4a8c7b673a3000203b68f74d84786817aec76cb1e85af217268159bda4b6
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
)
|
)
|
||||||
|
|
||||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||||
@ -16,13 +15,19 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
||||||
|
set(JANSSON_BUILD_SHARED_LIBS ON)
|
||||||
|
else()
|
||||||
|
set(JANSSON_BUILD_SHARED_LIBS OFF)
|
||||||
|
endif()
|
||||||
|
|
||||||
vcpkg_configure_cmake(
|
vcpkg_configure_cmake(
|
||||||
SOURCE_PATH ${SOURCE_PATH}
|
SOURCE_PATH ${SOURCE_PATH}
|
||||||
OPTIONS
|
OPTIONS
|
||||||
-DJANSSON_STATIC_CRT=${JANSSON_STATIC_CRT}
|
-DJANSSON_STATIC_CRT=${JANSSON_STATIC_CRT}
|
||||||
-DJANSSON_EXAMPLES=OFF
|
-DJANSSON_EXAMPLES=OFF
|
||||||
-DJANSSON_WITHOUT_TESTS=OFF
|
-DJANSSON_WITHOUT_TESTS=ON
|
||||||
-DJANSSON_BUILD_SHARED_LIBS=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}/debug/cmake)
|
||||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake)
|
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake)
|
||||||
|
|
||||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
if(VCPKG_CRT_LINKAGE STREQUAL static)
|
||||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
|
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user