diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-03-22 04:38:03 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-03-23 09:54:53 -0700 |
| commit | 0167d4f917c7c49ed2041f499bbab6e28fcc9168 (patch) | |
| tree | 1b6507520ebea021b3a1c3ec2bdc55335f07f594 | |
| parent | 3d634005fb177457278f99619d98e51d958b7fc4 (diff) | |
| download | vcpkg-0167d4f917c7c49ed2041f499bbab6e28fcc9168.tar.gz vcpkg-0167d4f917c7c49ed2041f499bbab6e28fcc9168.zip | |
[cctz][abseil] Require c++14 internally
| -rw-r--r-- | ports/abseil/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ports/abseil/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/cctz/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ports/cctz/portfile.cmake | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/ports/abseil/CMakeLists.txt b/ports/abseil/CMakeLists.txt index c30f75e32..ced5b14ca 100644 --- a/ports/abseil/CMakeLists.txt +++ b/ports/abseil/CMakeLists.txt @@ -3,6 +3,8 @@ project(abseil CXX) add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN) +set(CMAKE_CXX_STANDARD 14) + set(CMAKE_DEBUG_POSTFIX d) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) @@ -90,4 +92,4 @@ install( FILE unofficial-abseil-config.cmake NAMESPACE unofficial::abseil:: DESTINATION share/unofficial-abseil -)
\ No newline at end of file +) diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index 46b665a14..7f8f28798 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -7,7 +7,7 @@ endif() vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO abseil/abseil-cpp
- REF 506fb4b56a339314fde23802bd749dbc3b3c1c79 + REF 506fb4b56a339314fde23802bd749dbc3b3c1c79
SHA512 a67d51afcf4446d2c5f27258174dd012e4c15ee1f69eb074770d4f5af335e661b1cafa6b46f6b61b9f7ff0379e7822a03c6d55096dc78a13e554688a8872ebf8
HEAD_REF master
)
@@ -21,8 +21,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-abseil)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/abseil ${CURRENT_PACKAGES_DIR}/share/unofficial-abseil)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-abseil TARGET_PATH share/unofficial-abseil)
file(GLOB_RECURSE HEADERS ${CURRENT_PACKAGES_DIR}/include/*)
foreach(FILE ${HEADERS})
diff --git a/ports/cctz/CMakeLists.txt b/ports/cctz/CMakeLists.txt index 99322d05e..af557830c 100644 --- a/ports/cctz/CMakeLists.txt +++ b/ports/cctz/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 3.8)
project(cctz CXX)
+set(CMAKE_CXX_STANDARD 14)
+
set(CMAKE_DEBUG_POSTFIX d)
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
diff --git a/ports/cctz/portfile.cmake b/ports/cctz/portfile.cmake index 5760e7672..d243e1e65 100644 --- a/ports/cctz/portfile.cmake +++ b/ports/cctz/portfile.cmake @@ -20,8 +20,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-cctz)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/cctz ${CURRENT_PACKAGES_DIR}/share/unofficial-cctz)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-cctz TARGET_PATH share/unofficial-cctz)
vcpkg_copy_pdbs()
|