Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Cesium library list to match the current state of cesium-native #2647

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Cesium library list to match the current state of cesium-native #2647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 93 additions & 5 deletions cmake/FindCesiumNative.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,19 +104,107 @@ find_cesium_library(CESIUM_NATIVE_RASTER_OVERLAYS CesiumRasterOverlays)
find_cesium_library(CESIUM_NATIVE_3DTILES_CONTENT Cesium3DTilesContent)
find_cesium_library(CESIUM_NATIVE_GLTF_CONTENT CesiumGltfContent)

find_cesium_library(CESIUM_NATIVE_CSPRNG csprng)
find_cesium_library(CESIUM_NATIVE_CRYPTO crypto)
find_cesium_library(CESIUM_NATIVE_DRACO draco)
find_cesium_library(CESIUM_NATIVE_FMT fmt)
find_cesium_library(CESIUM_NATIVE_KTX ktx)
find_cesium_library(CESIUM_NATIVE_MODPB64 modp_b64)
find_cesium_library(CESIUM_NATIVE_S2GEOMETRY s2geometry)
find_cesium_library(CESIUM_NATIVE_MODPBASE64 modpbase64)
find_cesium_library(CESIUM_NATIVE_S2 s2)
find_cesium_library(CESIUM_NATIVE_SPDLOG spdlog)
find_cesium_library(CESIUM_NATIVE_SSL ssl)
find_cesium_library(CESIUM_NATIVE_TINYXML2 tinyxml2)
find_cesium_library(CESIUM_NATIVE_TURBOJPEG turbojpeg)
find_cesium_library(CESIUM_NATIVE_URIPARSER uriparser)
find_cesium_library(CESIUM_NATIVE_WEBPDECODER webpdecoder)
find_cesium_library(CESIUM_NATIVE_MESHOPTIMIZER meshoptimizer)


find_cesium_library(CESIUM_NATIVE_ZSTD zstd)

find_cesium_library(CESIUM_NATIVE_ABSL_BAD_ANY_CAST_IMPL absl_bad_any_cast_impl)
find_cesium_library(CESIUM_NATIVE_ABSL_BAD_OPTIONAL_ACCESS absl_bad_optional_access)
find_cesium_library(CESIUM_NATIVE_ABSL_BAD_VARIANT_ACCESS absl_bad_variant_access)
find_cesium_library(CESIUM_NATIVE_ABSL_BASE absl_base)
find_cesium_library(CESIUM_NATIVE_ABSL_CITY absl_city)
find_cesium_library(CESIUM_NATIVE_ABSL_CIVIL_TIME absl_civil_time)
find_cesium_library(CESIUM_NATIVE_ABSL_CORD_INTERNAL absl_cord_internal)
find_cesium_library(CESIUM_NATIVE_ABSL_CORD absl_cord)
find_cesium_library(CESIUM_NATIVE_ABSL_CORDZ_FUNCTIONS absl_cordz_functions)
find_cesium_library(CESIUM_NATIVE_ABSL_CORDZ_HANDLE absl_cordz_handle)
find_cesium_library(CESIUM_NATIVE_ABSL_CORDZ_INFO absl_cordz_info)
find_cesium_library(CESIUM_NATIVE_ABSL_CORDZ_SAMPLE_TOKEN absl_cordz_sample_token)
find_cesium_library(CESIUM_NATIVE_ABSL_CRC_CORD_STATE absl_crc_cord_state)
find_cesium_library(CESIUM_NATIVE_ABSL_CRC_CPU_DETECT absl_crc_cpu_detect)
find_cesium_library(CESIUM_NATIVE_ABSL_CRC_INTERNAL absl_crc_internal)
find_cesium_library(CESIUM_NATIVE_ABSL_CRC32C absl_crc32c)
find_cesium_library(CESIUM_NATIVE_ABSL_DEBUGGING_INTERNAL absl_debugging_internal)
find_cesium_library(CESIUM_NATIVE_ABSL_DEMANGLE_INTERNAL absl_demangle_internal)
find_cesium_library(CESIUM_NATIVE_ABSL_DIE_IF_NULL absl_die_if_null)
find_cesium_library(CESIUM_NATIVE_ABSL_EXAMINE_STACK absl_examine_stack)
find_cesium_library(CESIUM_NATIVE_ABSL_EXPONENTIAL_BIASED absl_exponential_biased)
find_cesium_library(CESIUM_NATIVE_ABSL_FAILURE_SIGNAL_HANDLER absl_failure_signal_handler)
find_cesium_library(CESIUM_NATIVE_ABSL_FLAGS_COMMANDLINEFLAG_INTERNAL absl_flags_commandlineflag_internal)
find_cesium_library(CESIUM_NATIVE_ABSL_FLAGS_COMMANDLINEFLAG absl_flags_commandlineflag)
find_cesium_library(CESIUM_NATIVE_ABSL_FLAGS_CONFIG absl_flags_config)
find_cesium_library(CESIUM_NATIVE_ABSL_FLAGS_INTERNAL absl_flags_internal)
find_cesium_library(CESIUM_NATIVE_ABSL_FLAGS_MARSHALLING absl_flags_marshalling)
find_cesium_library(CESIUM_NATIVE_ABSL_FLAGS_PARSE absl_flags_parse)
find_cesium_library(CESIUM_NATIVE_ABSL_FLAGS_PRIVATE_HANDLE_ACCESSOR absl_flags_private_handle_accessor)
find_cesium_library(CESIUM_NATIVE_ABSL_FLAGS_PROGRAM_NAME absl_flags_program_name)
find_cesium_library(CESIUM_NATIVE_ABSL_FLAGS_REFLECTION absl_flags_reflection)
find_cesium_library(CESIUM_NATIVE_ABSL_FLAGS_USAGE_INTERNAL absl_flags_usage_internal)
find_cesium_library(CESIUM_NATIVE_ABSL_FLAGS_USAGE absl_flags_usage)
find_cesium_library(CESIUM_NATIVE_ABSL_GRAPHCYCLES_INTERNAL absl_graphcycles_internal)
find_cesium_library(CESIUM_NATIVE_ABSL_HASH absl_hash)
find_cesium_library(CESIUM_NATIVE_ABSL_HASHTABLEZ_SAMPLER absl_hashtablez_sampler)
find_cesium_library(CESIUM_NATIVE_ABSL_INT128 absl_int128)
find_cesium_library(CESIUM_NATIVE_ABSL_KERNEL_TIMEOUT_INTERNAL absl_kernel_timeout_internal)
find_cesium_library(CESIUM_NATIVE_ABSL_LEAK_CHECK absl_leak_check)
find_cesium_library(CESIUM_NATIVE_ABSL_LOG_ENTRY absl_log_entry)
find_cesium_library(CESIUM_NATIVE_ABSL_LOG_FLAGS absl_log_flags)
find_cesium_library(CESIUM_NATIVE_ABSL_LOG_GLOBALS absl_log_globals)
find_cesium_library(CESIUM_NATIVE_ABSL_LOG_INITIALIZE absl_log_initialize)
find_cesium_library(CESIUM_NATIVE_ABSL_LOG_INTERNAL_CHECK_OP absl_log_internal_check_op)
find_cesium_library(CESIUM_NATIVE_ABSL_LOG_INTERNAL_CONDITIONS absl_log_internal_conditions)
find_cesium_library(CESIUM_NATIVE_ABSL_LOG_INTERNAL_FNMATCH absl_log_internal_fnmatch)
find_cesium_library(CESIUM_NATIVE_ABSL_LOG_INTERNAL_FORMAT absl_log_internal_format)
find_cesium_library(CESIUM_NATIVE_ABSL_LOG_INTERNAL_GLOBALS absl_log_internal_globals)
find_cesium_library(CESIUM_NATIVE_ABSL_LOG_INTERNAL_LOG_SINK_SET absl_log_internal_log_sink_set)
find_cesium_library(CESIUM_NATIVE_ABSL_LOG_INTERNAL_MESSAGE absl_log_internal_message)
find_cesium_library(CESIUM_NATIVE_ABSL_LOG_INTERNAL_NULLGUARD absl_log_internal_nullguard)
find_cesium_library(CESIUM_NATIVE_ABSL_LOG_INTERNAL_PROTO absl_log_internal_proto)
find_cesium_library(CESIUM_NATIVE_ABSL_LOG_SEVERITY absl_log_severity)
find_cesium_library(CESIUM_NATIVE_ABSL_LOG_SINK absl_log_sink)
find_cesium_library(CESIUM_NATIVE_ABSL_LOW_LEVEL_HASH absl_low_level_hash)
find_cesium_library(CESIUM_NATIVE_ABSL_MALLOC_INTERNAL absl_malloc_internal)
find_cesium_library(CESIUM_NATIVE_ABSL_PERIODIC_SAMPLER absl_periodic_sampler)
find_cesium_library(CESIUM_NATIVE_ABSL_RANDOM_DISTRIBUTIONS absl_random_distributions)
find_cesium_library(CESIUM_NATIVE_ABSL_RANDOM_INTERNAL_DISTRIBUTION_TEST_UTIL absl_random_internal_distribution_test_util)
find_cesium_library(CESIUM_NATIVE_ABSL_RANDOM_INTERNAL_PLATFORM absl_random_internal_platform)
find_cesium_library(CESIUM_NATIVE_ABSL_RANDOM_INTERNAL_POOL_URBG absl_random_internal_pool_urbg)
find_cesium_library(CESIUM_NATIVE_ABSL_RANDOM_INTERNAL_RANDEN_HWAES_IMPL absl_random_internal_randen_hwaes_impl)
find_cesium_library(CESIUM_NATIVE_ABSL_RANDOM_INTERNAL_RANDEN_HWAES absl_random_internal_randen_hwaes)
find_cesium_library(CESIUM_NATIVE_ABSL_RANDOM_INTERNAL_RANDEN_SLOW absl_random_internal_randen_slow)
find_cesium_library(CESIUM_NATIVE_ABSL_RANDOM_INTERNAL_RANDEN absl_random_internal_randen)
find_cesium_library(CESIUM_NATIVE_ABSL_RANDOM_INTERNAL_SEED_MATERIAL absl_random_internal_seed_material)
find_cesium_library(CESIUM_NATIVE_ABSL_RANDOM_SEED_GEN_EXCEPTION absl_random_seed_gen_exception)
find_cesium_library(CESIUM_NATIVE_ABSL_RANDOM_SEED_SEQUENCES absl_random_seed_sequences)
find_cesium_library(CESIUM_NATIVE_ABSL_RAW_HASH_SET absl_raw_hash_set)
find_cesium_library(CESIUM_NATIVE_ABSL_RAW_LOGGING_INTERNAL absl_raw_logging_internal)
find_cesium_library(CESIUM_NATIVE_ABSL_SCOPED_SET_ENV absl_scoped_set_env)
find_cesium_library(CESIUM_NATIVE_ABSL_SPINLOCK_WAIT absl_spinlock_wait)
find_cesium_library(CESIUM_NATIVE_ABSL_STACKTRACE absl_stacktrace)
find_cesium_library(CESIUM_NATIVE_ABSL_STATUS absl_status)
find_cesium_library(CESIUM_NATIVE_ABSL_STATUSOR absl_statusor)
find_cesium_library(CESIUM_NATIVE_ABSL_STR_FORMAT_INTERNAL absl_str_format_internal)
find_cesium_library(CESIUM_NATIVE_ABSL_STRERROR absl_strerror)
find_cesium_library(CESIUM_NATIVE_ABSL_STRING_VIEW absl_string_view)
find_cesium_library(CESIUM_NATIVE_ABSL_STRINGS_INTERNAL absl_strings_internal)
find_cesium_library(CESIUM_NATIVE_ABSL_STRINGS absl_strings)
find_cesium_library(CESIUM_NATIVE_ABSL_SYMBOLIZE absl_symbolize)
find_cesium_library(CESIUM_NATIVE_ABSL_SYNCHRONIZATION absl_synchronization)
find_cesium_library(CESIUM_NATIVE_ABSL_THROW_DELEGATE absl_throw_delegate)
find_cesium_library(CESIUM_NATIVE_ABSL_TIME_ZONE absl_time_zone)
find_cesium_library(CESIUM_NATIVE_ABSL_TIME absl_time)
find_cesium_library(CESIUM_NATIVE_ABSL_VLOG_CONFIG_INTERNAL absl_vlog_config_internal)

if(NOT CESIUM_ANY_LIBRARY_MISSING)
set(CESIUM_NATIVE_FOUND TRUE)
Expand Down
8 changes: 6 additions & 2 deletions src/osgEarthCesium/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,12 @@ if (CESIUM_NATIVE_FOUND)
TEMPLATES ${TARGET_IN}
FOLDER "NodeKits")

target_link_libraries(${LIB_NAME} PRIVATE OE::CESIUM_NATIVE)

if(WIN32)
target_link_libraries(${LIB_NAME} PRIVATE OE::CESIUM_NATIVE CRYPT32)
else()
target_link_libraries(${LIB_NAME} PRIVATE OE::CESIUM_NATIVE)
endif()

# Include the Cesium Native headers BEFORE anything else to ensure that dependencies
# that might be duplicated like spdlog are included from the Cesium Native headers.
# Note: we had to comment out the INTERFACE_INCLUDE_DIRECTORIES from the OE::CESIUM_NATIVE import
Expand Down