Skip to content

Commit

Permalink
Temp
Browse files Browse the repository at this point in the history
  • Loading branch information
@lilleyse
lilleyse committed Sep 9, 2024
1 parent 9a9b11d commit ccf2c6d
Show file tree
Hide file tree
Showing 18 changed files with 233 additions and 54 deletions.
11 changes: 8 additions & 3 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,9 +255,14 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCH
-Wconversion
-Wno-missing-field-initializers
-Wno-return-local-addr
-Wno-array-bounds # Ignore false positives in libstdc++ in GCC 13.1.1
-fstrict-aliasing
-fstrict-enums)

if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
set(CESIUM_OMNI_CXX_FLAGS ${CESIUM_OMNI_CXX_FLAGS} -Wno-stringop-overflow) # Ignore false positives in libstdc++ in GCC 13.1.1
endif()

if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set(CESIUM_OMNI_CXX_FLAGS ${CESIUM_OMNI_CXX_FLAGS} -Wno-gnu-anonymous-struct)
endif()
Expand Down Expand Up @@ -393,7 +398,7 @@ endif()

# USD is compiled with the old C++ ABI so we need to compile our own code and external libraries
# with the old ABI. Only relevant for libraries that have std::string or std::list in their
# public interface, which includes cesium-native and cpr.
# public interface, which includes cesium-native and spdlog.
# See https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
set(CESIUM_OMNI_CXX_DEFINES ${CESIUM_OMNI_CXX_DEFINES} _GLIBCXX_USE_CXX11_ABI=0)
Expand Down Expand Up @@ -428,7 +433,7 @@ set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
find_package(Threads) # System threading library

# Conan libraries
find_package(cpr)
find_package(CURL)
find_package(doctest)
find_package(stb)
find_package(ZLIB)
Expand Down Expand Up @@ -465,7 +470,7 @@ endif()

# Generate ThirdParty.json
execute_process(COMMAND "${Python3_EXECUTABLE}" "${SCRIPTS_DIRECTORY}/generate_third_party_license_json.py" --build-dir
"${PROJECT_BINARY_DIR}" --project-dir "${PROJECT_SOURCE_DIR}" --skip "doctest,strawberryperl")
"${PROJECT_BINARY_DIR}" --project-dir "${PROJECT_SOURCE_DIR}" --skip "doctest")

# Copy docs and related resources to exts folder.
execute_process(COMMAND "${Python3_EXECUTABLE}" "${SCRIPTS_DIRECTORY}/copy_to_exts.py")
Expand Down
20 changes: 2 additions & 18 deletions ThirdParty.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@
"version": "0.17.0",
"url": "https://github.com/conan-io/cmake-conan"
},
{
"name": "cpr",
"license": [
"MIT"
],
"version": "1.10.4",
"url": "https://docs.libcpr.org/"
},
{
"name": "glTF-Asset-Generator",
"license": [
Expand All @@ -41,20 +33,12 @@
"version": "8.2.1",
"url": "https://curl.se"
},
{
"name": "nasm",
"license": [
"BSD-2-Clause"
],
"version": "2.15.05",
"url": "http://www.nasm.us"
},
{
"name": "openssl",
"license": [
"OpenSSL"
"Apache-2.0"
],
"version": "1.1.1w",
"version": "3.3.1",
"url": "https://github.com/openssl/openssl"
},
{
Expand Down
8 changes: 1 addition & 7 deletions cmake/AddConanDependencies.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,13 @@
include(ConfigureConan)

set(REQUIRES
"cpr/1.10.4@#860d6cd6d8eb5f893e647c2fb016eb61"
"doctest/2.4.9@#ea6440e3cd544c9a25bf3a96bcf16f48"
"openssl/1.1.1w@#42c32b02f62aa987a58201f4c4561d3e"
"pybind11/2.10.1@#561736204506dad955276aaab438aab4"
"stb/cci.20220909@#1c47474f095ef8cd9e4959558525b827"
"zlib/1.2.13@#13c96f538b52e1600c40b88994de240f"
"yaml-cpp/0.7.0@#85b409c274a53d226b71f1bdb9cb4f8b"
"libcurl/8.2.1@#8f62ba7135f5445e5fe6c4bd85143b53"
"nasm/2.15.05@#799d63b1672a337584b09635b0f22fc1")

if(WIN32)
set(REQUIRES ${REQUIRES} "strawberryperl/5.32.1.1@#8f83d05a60363a422f9033e52d106b47")
endif()
"openssl/3.3.1")

# cmake-format: off
configure_conan(
Expand Down
3 changes: 3 additions & 0 deletions cmake/Macros.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,9 @@ $<$<CONFIG:MinSizeRel>:${_EXPECTED_MINSIZEREL_POSTFIX}>")
set(EXTERN_CXX_FLAGS ${EXTERN_CXX_FLAGS} "/EHsc")
endif()

# set(EXTERN_CXX_FLAGS ${EXTERN_CXX_FLAGS} "-DVCPKG_CXX_FLAGS=\"/D_GLIBCXX_USE_CXX11_ABI=0\"")
# set(EXTERN_CXX_FLAGS ${EXTERN_CXX_FLAGS} "-DVCPKG_C_FLAGS=\"/D_GLIBCXX_USE_CXX11_ABI=0\"")

# Prepend options with -D
list(TRANSFORM _OPTIONS PREPEND -D)

Expand Down
110 changes: 103 additions & 7 deletions extern/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,122 @@ add_external_project(
CesiumIonClient
CesiumAsync
CesiumUtility
absl_bad_any_cast_impl
absl_bad_optional_access
absl_bad_variant_access
absl_base
absl_city
absl_civil_time
absl_cord
absl_cord_internal
absl_cordz_functions
absl_cordz_handle
absl_cordz_info
absl_cordz_sample_token
absl_crc32c
absl_crc_cord_state
absl_crc_cpu_detect
absl_crc_internal
absl_debugging_internal
absl_demangle_internal
absl_die_if_null
absl_examine_stack
absl_exponential_biased
absl_failure_signal_handler
absl_flags_commandlineflag
absl_flags_commandlineflag_internal
absl_flags_config
absl_flags_internal
absl_flags_marshalling
absl_flags_parse
absl_flags_private_handle_accessor
absl_flags_program_name
absl_flags_reflection
absl_flags_usage
absl_flags_usage_internal
absl_graphcycles_internal
absl_hash
absl_hashtablez_sampler
absl_int128
absl_kernel_timeout_internal
absl_leak_check
absl_log_entry
absl_log_flags
absl_log_globals
absl_log_initialize
absl_log_internal_check_op
absl_log_internal_conditions
absl_log_internal_fnmatch
absl_log_internal_format
absl_log_internal_globals
absl_log_internal_log_sink_set
absl_log_internal_message
absl_log_internal_nullguard
absl_log_internal_proto
absl_log_severity
absl_log_sink
absl_low_level_hash
absl_malloc_internal
absl_periodic_sampler
absl_random_distributions
absl_random_internal_distribution_test_util
absl_random_internal_platform
absl_random_internal_pool_urbg
absl_random_internal_randen
absl_random_internal_randen_hwaes
absl_random_internal_randen_hwaes_impl
absl_random_internal_randen_slow
absl_random_internal_seed_material
absl_random_seed_gen_exception
absl_random_seed_sequences
absl_raw_hash_set
absl_raw_logging_internal
absl_scoped_set_env
absl_spinlock_wait
absl_stacktrace
absl_status
absl_statusor
absl_strerror
absl_str_format_internal
absl_strings
absl_strings_internal
absl_string_view
absl_symbolize
absl_synchronization
absl_throw_delegate
absl_time
absl_time_zone
absl_vlog_config_internal
astcenc-avx2-static
async++
csprng
crypto
draco
fmt
glm
jpeg
ktx
modp_b64
s2geometry
libmodpbase64
meshoptimizer
s2
sharpyuv
spdlog
sqlite3
ssl
tinyxml2
turbojpeg
uriparser
webp
webpdecoder
turbojpeg
meshoptimizer
sqlite3
webpdemux
webpmux
z-ng
zstd
OPTIONS
CESIUM_TESTS_ENABLED=OFF
CESIUM_COVERAGE_ENABLED=OFF
CESIUM_TRACING_ENABLED=${CESIUM_OMNI_ENABLE_TRACING}
PROJECT_EXTERN_DIRECTORY
"${PROJECT_SOURCE_DIR}/extern"
EXPECTED_DEBUG_POSTFIX "d"
)
# cmake-format: on

Expand Down
2 changes: 1 addition & 1 deletion extern/cesium-native
Submodule cesium-native updated 128 files
111 changes: 104 additions & 7 deletions src/core/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,117 @@ setup_lib(
CesiumIonClient
CesiumAsync
CesiumUtility
absl_bad_any_cast_impl
absl_bad_optional_access
absl_bad_variant_access
absl_base
absl_city
absl_civil_time
absl_cord
absl_cord_internal
absl_cordz_functions
absl_cordz_handle
absl_cordz_info
absl_cordz_sample_token
absl_crc32c
absl_crc_cord_state
absl_crc_cpu_detect
absl_crc_internal
absl_debugging_internal
absl_demangle_internal
absl_die_if_null
absl_examine_stack
absl_exponential_biased
absl_failure_signal_handler
absl_flags_commandlineflag
absl_flags_commandlineflag_internal
absl_flags_config
absl_flags_internal
absl_flags_marshalling
absl_flags_parse
absl_flags_private_handle_accessor
absl_flags_program_name
absl_flags_reflection
absl_flags_usage
absl_flags_usage_internal
absl_graphcycles_internal
absl_hash
absl_hashtablez_sampler
absl_int128
absl_kernel_timeout_internal
absl_leak_check
absl_log_entry
absl_log_flags
absl_log_globals
absl_log_initialize
absl_log_internal_check_op
absl_log_internal_conditions
absl_log_internal_fnmatch
absl_log_internal_format
absl_log_internal_globals
absl_log_internal_log_sink_set
absl_log_internal_message
absl_log_internal_nullguard
absl_log_internal_proto
absl_log_severity
absl_log_sink
absl_low_level_hash
absl_malloc_internal
absl_periodic_sampler
absl_random_distributions
absl_random_internal_distribution_test_util
absl_random_internal_platform
absl_random_internal_pool_urbg
absl_random_internal_randen
absl_random_internal_randen_hwaes
absl_random_internal_randen_hwaes_impl
absl_random_internal_randen_slow
absl_random_internal_seed_material
absl_random_seed_gen_exception
absl_random_seed_sequences
absl_raw_hash_set
absl_raw_logging_internal
absl_scoped_set_env
absl_spinlock_wait
absl_stacktrace
absl_status
absl_statusor
absl_strerror
absl_str_format_internal
absl_strings
absl_strings_internal
absl_string_view
absl_symbolize
absl_synchronization
absl_throw_delegate
absl_time
absl_time_zone
absl_vlog_config_internal
astcenc-avx2-static
async++
csprng
crypto
draco
fmt
glm
jpeg
ktx
modp_b64
s2geometry
libmodpbase64
meshoptimizer
s2
sharpyuv
spdlog
sqlite3
ssl
tinyxml2
turbojpeg
uriparser
webp
webpdecoder
turbojpeg
meshoptimizer
sqlite3
cpr::cpr
webpdemux
webpmux
z-ng
zstd
CURL::libcurl
stb::stb
ZLIB::ZLIB
fabric
Expand Down
2 changes: 1 addition & 1 deletion src/core/src/FabricGeometryPool.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "cesium/omniverse/FabricVertexAttributeDescriptor.h"
#include "cesium/omniverse/GltfUtil.h"

#include <spdlog/fmt/fmt.h>
#include <fmt/format.h>

namespace cesium::omniverse {

Expand Down
2 changes: 1 addition & 1 deletion src/core/src/FabricMaterial.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
#include "cesium/omniverse/UsdUtil.h"

#include <CesiumGltf/MeshPrimitive.h>
#include <fmt/format.h>
#include <glm/gtc/random.hpp>
#include <omni/fabric/FabricUSD.h>
#include <omni/fabric/SimStageWithHistory.h>
#include <spdlog/fmt/fmt.h>

namespace cesium::omniverse {

Expand Down
2 changes: 1 addition & 1 deletion src/core/src/FabricMaterialPool.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "cesium/omniverse/FabricUtil.h"
#include "cesium/omniverse/MetadataUtil.h"

#include <spdlog/fmt/fmt.h>
#include <fmt/format.h>

namespace cesium::omniverse {

Expand Down
Loading

0 comments on commit ccf2c6d

Please sign in to comment.