-
Notifications
You must be signed in to change notification settings - Fork 83
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #529 from CesiumGS/remove-gsl
Replace `gsl::span` with `std::span`
- Loading branch information
Showing
7 changed files
with
120 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule cesium-native
updated
367 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| if(NOT VCPKG_TARGET_IS_WINDOWS) | ||
| vcpkg_check_linkage(ONLY_STATIC_LIBRARY) | ||
| endif() | ||
|
|
||
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| REPO abseil/abseil-cpp | ||
| REF "20240722.0" | ||
| SHA512 bd2cca8f007f2eee66f51c95a979371622b850ceb2ce3608d00ba826f7c494a1da0fba3c1427728f2c173fe50d59b701da35c2c9fdad2752a5a49746b1c8ef31 | ||
| HEAD_REF master | ||
| ) | ||
|
|
||
| # With ABSL_PROPAGATE_CXX_STD=ON abseil automatically detect if it is being | ||
| # compiled with C++14 or C++17, and modifies the installed `absl/base/options.h` | ||
| # header accordingly. This works even if CMAKE_CXX_STANDARD is not set. Abseil | ||
| # uses the compiler default behavior to update `absl/base/options.h` as needed. | ||
| set(ABSL_USE_CXX17_OPTION "") | ||
| if("cxx17" IN_LIST FEATURES) | ||
| set(ABSL_USE_CXX17_OPTION "-DCMAKE_CXX_STANDARD=17") | ||
| endif() | ||
|
|
||
| set(ABSL_STATIC_RUNTIME_OPTION "") | ||
| if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_CRT_LINKAGE STREQUAL "static") | ||
| set(ABSL_STATIC_RUNTIME_OPTION "-DABSL_MSVC_STATIC_RUNTIME=ON") | ||
| endif() | ||
|
|
||
| # Don't let Abseil clobber our CMAKE_MSVC_RUNTIME_LIBRARY choice. | ||
| vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "set(CMAKE_MSVC_RUNTIME_LIBRARY \"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\")" "#set(CMAKE_MSVC_RUNTIME_LIBRARY \"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\")") | ||
|
|
||
| vcpkg_cmake_configure( | ||
| SOURCE_PATH "${SOURCE_PATH}" | ||
| DISABLE_PARALLEL_CONFIGURE | ||
| OPTIONS | ||
| -DABSL_PROPAGATE_CXX_STD=OFF | ||
| -DCMAKE_CXX_STANDARD=14 | ||
| ${ABSL_USE_CXX17_OPTION} | ||
| ${ABSL_STATIC_RUNTIME_OPTION} | ||
| ) | ||
|
|
||
| # Don't let our customized version of Abseil pose as the real thing. | ||
| vcpkg_replace_string("${SOURCE_PATH}/absl/base/options.h" "ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20240722" "ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20240722_cesium_for_unreal") | ||
| vcpkg_replace_string("${SOURCE_PATH}/absl/base/options.h" "ABSL_OPTION_USE_STD_ANY 2" "ABSL_OPTION_USE_STD_ANY 0") | ||
| vcpkg_replace_string("${SOURCE_PATH}/absl/base/options.h" "ABSL_OPTION_USE_STD_OPTIONAL 2" "ABSL_OPTION_USE_STD_OPTIONAL 0") | ||
| vcpkg_replace_string("${SOURCE_PATH}/absl/base/options.h" "ABSL_OPTION_USE_STD_STRING_VIEW 2" "ABSL_OPTION_USE_STD_STRING_VIEW 0") | ||
| vcpkg_replace_string("${SOURCE_PATH}/absl/base/options.h" "ABSL_OPTION_USE_STD_VARIANT 2" "ABSL_OPTION_USE_STD_VARIANT 0") | ||
| vcpkg_replace_string("${SOURCE_PATH}/absl/base/options.h" "ABSL_OPTION_USE_STD_ORDERING 2" "ABSL_OPTION_USE_STD_ORDERING 0") | ||
| vcpkg_replace_string("${SOURCE_PATH}/absl/base/config.h" "#define ABSL_LTS_RELEASE_VERSION 20240722" "//#define ABSL_LTS_RELEASE_VERSION 20240722") | ||
| vcpkg_replace_string("${SOURCE_PATH}/absl/base/config.h" "#define ABSL_LTS_RELEASE_PATCH_LEVEL 0" "//#define ABSL_LTS_RELEASE_PATCH_LEVEL 0") | ||
|
|
||
| # Apply this patch to fix C++20 build with Android NDK r25 | ||
| # https://github.com/abseil/abseil-cpp/pull/1728 | ||
| vcpkg_replace_string("${SOURCE_PATH}/absl/time/time.h" "__cpp_impl_three_way_comparison" "__cpp_lib_three_way_comparison") | ||
| vcpkg_replace_string("${SOURCE_PATH}/absl/strings/cord.h" "__cpp_impl_three_way_comparison" "__cpp_lib_three_way_comparison") | ||
|
|
||
| vcpkg_cmake_install() | ||
| vcpkg_cmake_config_fixup(PACKAGE_NAME absl CONFIG_PATH lib/cmake/absl) | ||
| vcpkg_fixup_pkgconfig() | ||
|
|
||
| vcpkg_copy_pdbs() | ||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" | ||
| "${CURRENT_PACKAGES_DIR}/debug/include" | ||
| "${CURRENT_PACKAGES_DIR}/include/absl/copts" | ||
| "${CURRENT_PACKAGES_DIR}/include/absl/strings/testdata" | ||
| "${CURRENT_PACKAGES_DIR}/include/absl/time/internal/cctz/testdata" | ||
| ) | ||
|
|
||
| if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") | ||
| vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/config.h" "defined(ABSL_CONSUME_DLL)" "1") | ||
| vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/internal/thread_identity.h" "defined(ABSL_CONSUME_DLL)" "1") | ||
| endif() | ||
|
|
||
| vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| { | ||
| "name": "abseil", | ||
| "version": "20240722.0-cesium-for-unreal", | ||
| "description": [ | ||
| "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", | ||
| "In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.", | ||
| "Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole." | ||
| ], | ||
| "homepage": "https://github.com/abseil/abseil-cpp", | ||
| "license": "Apache-2.0", | ||
| "dependencies": [ | ||
| { | ||
| "name": "vcpkg-cmake", | ||
| "host": true | ||
| }, | ||
| { | ||
| "name": "vcpkg-cmake-config", | ||
| "host": true | ||
| } | ||
| ], | ||
| "features": { | ||
| "cxx17": { | ||
| "description": "Enable compiler C++17." | ||
| } | ||
| } | ||
| } |