mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 03:49:00 +08:00
964f2fa145
* [cryptopp] Update to version 8.6.0 * Update ports/cryptopp/vcpkg.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * regenerate versions * retrigger agent * retrigger agent * [crypto] modify patch according upsteam PR, modify version field * update deprecated functions * Update versions/c-/cryptopp.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Igor Kostenko <ikostenko@perforce.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index fb43b95..c39e470 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -451,6 +451,10 @@ if (MSVC)
|
|
endif()
|
|
endif ()
|
|
|
|
+if(WINDOWS_STORE)
|
|
+ add_definitions(-DCRYPTOPP_DISABLE_NACL=1)
|
|
+endif()
|
|
+
|
|
# Enable PIC for all target machines except 32-bit i386 due to register pressures.
|
|
if (NOT CRYPTOPP_I386)
|
|
SET(CMAKE_POSITION_INDEPENDENT_CODE 1)
|
|
@@ -1022,10 +1026,10 @@ endif ()
|
|
# add_compile_definitions added in CMake 3.12
|
|
if (${CMAKE_VERSION} VERSION_LESS "3.12")
|
|
# https://stackoverflow.com/q/61250087
|
|
- add_definitions("${CMAKE_CPP_FLAGS}" "${CMAKE_CXX_FLAGS}" "${CRYPTOPP_COMPILE_DEFINITIONS}" "${CRYPTOPP_COMPILE_OPTIONS}")
|
|
+ add_definitions(${CMAKE_CPP_FLAGS} ${CRYPTOPP_COMPILE_DEFINITIONS} ${CRYPTOPP_COMPILE_OPTIONS})
|
|
else()
|
|
- add_compile_definitions("${CMAKE_CPP_FLAGS}" "${CRYPTOPP_COMPILE_DEFINITIONS}")
|
|
- add_compile_options("${CMAKE_CXX_FLAGS}" "${CRYPTOPP_COMPILE_OPTIONS}")
|
|
+ add_compile_definitions(${CRYPTOPP_COMPILE_DEFINITIONS})
|
|
+ add_compile_options(${CMAKE_CPP_FLAGS} ${CRYPTOPP_COMPILE_OPTIONS})
|
|
endif()
|
|
|
|
#============================================================================
|