mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-23 05:57:50 +08:00
d1729dcaf5
* improvement: has oatpp package * [oatpp] includes _CRT_SECURE_NO_WARNINGS compile-time flag * [oatpp] no curl submodule (until it catches up with core) * [oatpp] now version 0.19.11. Still no libretls module because of libretls3.0 dependency. * no accidentally added debug messages in vcpkg_execute_build_process.cmake * [oatpp] no empty depends line in CONTROL file * [oatpp] no dump_variables() function in portfile.cmake * [oatpp] no wwrning that only static libraries are supported * [oatpp] uses vcpkg_check_linkage(ONLY_STATIC_LIBRARY) call * [oatpp] curl submodule does not rely on pkg-config * [oatpp] curl-submodule-no-pkg-config-in-vcpkg works on linux and windows * [oatpp] portfile cleaned up * [oatpp] no carriage returns in patch * [oatpp]: split modules into their own ports * [oatpp-libressl]: remove variable dump * [libressl]: has check for UWP and ARM restored * [libressl]: has check for UWP and ARM restored * [libressl]: has check for UWP and ARM restored * [oatpp-libressl]: builds if libressl works * [oatpp]: version 1.0.0 * [oatpp]: no "Building ..." message Co-authored-by: heymamd1 <Michael.Heyman@jhuapl.edu>
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 477064a..5da99e9 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -95,8 +95,26 @@ message("## ${OATPP_THIS_MODULE_NAME} module. Resolving dependencies...\n")
|
|
##############################
|
|
## Find libcurl dependency
|
|
|
|
-include(FindPkgConfig)
|
|
-pkg_check_modules(PKG_CURL REQUIRED libcurl)
|
|
+if (VCPKG_TOOLCHAIN)
|
|
+ find_package(CURL REQUIRED)
|
|
+ if (CMAKE_BUILD_TYPE MATCHES "^[Dd][Ee][Bb][Uu][Gg]$")
|
|
+ get_filename_component(PKG_CURL_LIBRARIES ${CURL_LIBRARY_DEBUG} NAME)
|
|
+ get_filename_component(PKG_CURL_LIBRARY_DIR ${CURL_LIBRARY_DEBUG} DIRECTORY)
|
|
+ else()
|
|
+ get_filename_component(PKG_CURL_LIBRARIES ${CURL_LIBRARY_RELEASE} NAME)
|
|
+ get_filename_component(PKG_CURL_LIBRARY_DIR ${CURL_LIBRARY_RELEASE} DIRECTORY)
|
|
+ endif()
|
|
+ if (PKG_CURL_LIBRARIES MATCHES [[^.*\.a$]])
|
|
+ string(LENGTH ${PKG_CURL_LIBRARIES} _LEN)
|
|
+ math(EXPR _LEN "${_LEN} - 5")
|
|
+ string(SUBSTRING ${PKG_CURL_LIBRARIES} 3 ${_LEN} PKG_CURL_LIBRARIES)
|
|
+ endif()
|
|
+ set(PKG_CURL_VERSION ${CURL_VERSION})
|
|
+ set(PKG_CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIRS})
|
|
+else()
|
|
+ include(FindPkgConfig)
|
|
+ pkg_check_modules(PKG_CURL REQUIRED libcurl)
|
|
+endif()
|
|
|
|
message("[libcurl] libcurl found:")
|
|
message("[libcurl] LIBRARIES=${PKG_CURL_LIBRARIES}")
|