Commit Graph

264 Commits

Author SHA1 Message Date
Joseph Kaile befa8df2a3 abandon trying to install component 2023-03-09 13:16:37 -05:00
Joseph Kaile 9e598bda38 revert to something to an error i can fix 2023-03-09 04:28:34 -05:00
Joseph Kaile b5a0cbc04a test whehter passing CMAKE_SYSTEM_NAME makes a difference 2023-03-09 02:39:24 -05:00
Joseph Kaile 6fb592814e test whether empty strings in the configure command is breaking everything 2023-03-09 01:04:45 -05:00
Joseph Kaile 387d9a902e undo rearanging order of cmake args 2023-03-08 23:54:42 -05:00
Joseph Kaile f937b5d1a0 dont shadow toolchain variables with empty params from command line 2023-03-08 23:19:14 -05:00
Joseph Kaile cded26ccfa revert last commit 2023-03-08 21:20:11 -05:00
Joseph Kaile de1799ecb1 update libjpegturbo, fixing ue4 macos build 2023-03-08 17:40:11 -05:00
Joseph Kaile b20d0464ea pass osx version directly to libjpegturbo 2023-03-08 02:09:43 -05:00
Joseph Kaile 232c08ccf3 remove stray \ breaking build 2023-03-07 22:44:58 -05:00
Joseph Kaile e08f2740c6 make sure cmake-system-processor is not empty 2023-03-07 20:24:04 -05:00
Joseph Kaile 020dac1d9d install only libjpeg-turbo static library 2023-03-07 18:30:09 -05:00
Joseph Kaile b0d3620596 use generator expression to simplify code a bit 2023-03-06 22:36:05 -05:00
Joseph Kaile 6541b30bb2
pass osx deployment target 2023-03-06 18:10:02 -05:00
Joseph Kaile ea3b028f55 update libjpeg-trubo 2023-03-06 13:58:31 -05:00
Joseph Kaile 039921b5e9 update libjpeg-turbo 2023-03-06 13:37:25 -05:00
Joseph Kaile 06a193d4a9 fix cmake syntax error, address pr comments 2023-03-05 01:55:46 -05:00
Joseph Kaile f0e91283a4 another fix for setting toolchain path.. 2023-03-05 00:32:45 -05:00
Joseph Kaile 18b8102dd3 create absolute path for older cmake versions 2023-03-04 21:37:33 -05:00
Joseph Kaile a443f1f50e pass debug postfix, fix \MT \MD mismatch 2023-03-04 15:32:35 -05:00
Joseph Kaile 9c1fe35158 fix for debug library postfix 2023-03-04 12:32:53 -05:00
Joseph Kaile 3a185757ec fix configure line for older version of cmake? 2023-03-03 22:42:00 -05:00
Joseph Kaile c6a625824a pass debug postfix 2023-03-03 19:43:06 -05:00
Joseph Kaile 0cb080cd83 remove formatting cmake command 2023-03-02 11:12:26 -05:00
Joseph Kaile 856b60d9ed get rid of all executables in libjpeg-turbo 2023-03-01 20:24:29 -05:00
Joseph Kaile 736d16af8b fix for macos and iphone 2023-03-01 20:18:01 -05:00
Joseph Kaile 9750684294 pass generator platform to fix vs2017 build 2023-03-01 12:50:18 -05:00
Joseph Kaile 41c63ad01e change extrnal project add to support android builds 2023-03-01 00:11:27 -05:00
Joseph Kaile e73d4849d2 use msvc not platform_name==windows 2023-02-21 19:45:58 -05:00
Joseph Kaile 4f2516ab42 fix gcc build error 2023-02-21 18:49:22 -05:00
Joseph Kaile 08db323884 make sure lib path isnt dependent on CMAKE_BUILD_TYPE 2023-02-21 15:53:16 -05:00
Joseph Kaile c4f2d04d34 fix build for vs2017 2023-02-21 14:48:00 -05:00
Joseph Kaile dae5cf4b65 skip externalproject install, use build-in-source header/lib path 2023-02-21 13:40:17 -05:00
Joseph Kaile 924449323e install library file 2023-02-21 12:34:28 -05:00
Joseph Kaile f5899fde8d add libjpegturbo license 2023-02-21 12:12:33 -05:00
Joseph Kaile d2662a6d48 fix turbojpeg.h not found error 2023-02-21 00:27:21 -05:00
Joseph Kaile 573025e6e0 add libjpegturbo as external project and create imported target 2023-02-20 13:47:53 -05:00
Joseph Kaile ab9a049cb3 add libjeg-turbo submodule 2023-02-20 13:00:15 -05:00
Kevin Ring 865b8b9dc4 Upgrade tinyxml2. 2023-01-20 15:58:59 +11:00
Kevin Ring 12d74b3834 Revert unnecessary KTX-Software changes. 2022-12-06 12:03:01 +11:00
Kevin Ring b032100f47 Update KTX-Software. 2022-11-17 19:33:48 +11:00
Kevin Ring 77812bc023 Update KTX-Software. 2022-11-17 18:23:16 +11:00
Kevin Ring f31638fbfa Cleaner RasterOverlay error reporting. 2022-10-18 17:59:23 +11:00
Nithin Pranesh 04c1d7613e [skip ci] Revert "uncheck enable simd"
This reverts commit 69569b8afe.
2022-08-31 16:14:05 -04:00
Joseph Kaile 69569b8afe uncheck enable simd 2022-08-31 13:50:14 -04:00
Nithin Pranesh 7c1f3ee45d
Merge branch 'main' into webp-support 2022-08-30 23:21:30 -04:00
Joseph Kaile c3d5d727d2 use version 1.2.4 of libwebp 2022-08-29 17:18:12 -04:00
Joseph Kaile e79136ad4f Add libwebp to cmake 2022-08-17 16:57:36 -04:00
Joseph Kaile 022a11c913 add libwebp submodule 2022-08-17 12:59:16 -04:00
Bao Tran 5aa90be1b8 revert extern libs 2022-06-27 15:13:25 -04:00
Bao Tran b6237eac50 fix libmorton lib warning 2022-05-25 11:24:01 -04:00
Kevin Ring 798e0591fe Downgrade cpp-httplib to v0.10.3.
Later versions up to v0.10.6 have warnings in VS2017 that get treated as
errors and break our build.
2022-05-06 13:32:04 +10:00
Kevin Ring c169008582 Update third party libraries and thirdparty.json. 2022-05-06 12:28:54 +10:00
Bao Tran beee13175c add comment to solve the case where morton index is overflow. Add libmorton 2022-05-03 13:45:45 -04:00
Bao Tran 138d57968c remove entt subdirectory 2022-04-28 12:34:21 -04:00
Bao Tran 2276a957af remove entt submodule 2022-04-28 11:46:04 -04:00
Bao Tran 1b4f7a7ad8 create custom user storage using ecs 2022-04-15 16:47:55 -04:00
Kevin Ring ab433cd2ad Be sure to target iOS 12+. 2022-02-24 11:49:47 +11:00
Kevin Ring dd4f1d70f3 Revert to previous (newer) version of Async++. 2022-02-24 10:48:57 +11:00
Nithin Pranesh 9c889914dd remove commented cmake hack for ktx-software 2022-02-14 10:44:18 -05:00
Nithin Pranesh 53b828a9ca Merge remote-tracking branch 'origin/main' into ktx2-nithin 2021-12-19 17:23:39 -05:00
Sean Lilley 2cdcb92e20 Namespace cleanup 2021-12-02 18:34:22 -05:00
Kevin Ring 962aaddffb Use CesiumGS fork of KTX-Software, fix clang compiler error. 2021-11-30 11:56:01 +11:00
Nithin Pranesh a637a35c69 almost a workaround for some issues with KTX-Software (commented out currently) 2021-11-22 18:07:31 -05:00
Nithin Pranesh b42320ec01 Add KTX-Software as cmake dependency
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-11-22 03:10:23 -05:00
Ian Lilley 47de191da1 improved precision when using rapidjson 2021-11-12 14:11:42 -05:00
Kevin Ring de1b237a25 Target C++11 for s2geometry.
Apparently it doesn't build when targeting C++17 with Visual Studio.
2021-11-12 20:30:25 +11:00
Kevin Ring c55a550467 Don't disable CXX_EXTENSIONS for s2geometry. 2021-11-12 20:01:51 +11:00
Kevin Ring 9f821fd271 Use C++17 for s2geometry. 2021-11-12 19:41:26 +11:00
Kevin Ring e89bac66f6 Add ability to convert S2 cell to a GlobeRectangle. 2021-11-12 16:33:32 +11:00
Kevin Ring d53a63b2fa Merge remote-tracking branch 'origin/main' into s2 2021-11-09 13:36:30 +11:00
Kevin Ring 3d4d82b38e Add some doc. 2021-11-09 12:35:55 +11:00
Kevin Ring 836def93de Upgrade Catch2 from v2.12.2 to v2.13.7.
This fixes compilation failures on newer Linux versions.
2021-11-07 20:46:58 +11:00
Kevin Ring d8a7e885d2 Fix some Linux build problems.
But it doesn't work yet.
2021-11-05 16:18:05 +11:00
Kevin Ring 92f0d71b51 WIP support for S2 bounding volumes. 2021-11-04 23:58:58 +11:00
Marco Hutter 421bfa201a Removed magic_enum 2021-09-26 15:16:08 +02:00
Marco Hutter c73ec558eb Removed magic_enum dependency
It was only used in CesiumGltfWriter, and is no longer
required after the glTF enum updates
2021-09-26 15:11:57 +02:00
Kevin Ring 8b43bf4e40 Clean up earcut cmake config. 2021-08-17 16:14:32 +10:00
Kevin Ring 85965760cd Merge remote-tracking branch 'origin/main' into clipping-2.5d-kring 2021-07-29 16:33:34 +10:00
Sean Lilley 074d098272 Fix linux build 2021-07-26 17:29:48 -04:00
Bao Tran 1c608a9dd4 attempt to unify draco target 2021-07-26 17:03:13 -04:00
Bao Tran 3dc4c2da40 suppress draco warning on MSVC and define draco alias target 2021-07-26 16:43:36 -04:00
Sean Lilley 46c5a41827 Update draco version so that cesium-native builds in gcc 11 2021-07-26 16:17:57 -04:00
Nithin Pranesh 0264599319 Merge branch 'main' into clipping-2.5d 2021-06-23 15:27:21 -04:00
Kevin Ring abd42bee86 Merge remote-tracking branch 'origin/main' into sqlite 2021-05-28 15:19:34 +10:00
Nithin Pranesh 6e7d53f9a9 don't look for zlib or openssl 2021-05-27 16:42:14 -04:00
Nithin Pranesh c0cab12aa9 don't look for Zlib or OpenSSL 2021-05-27 14:35:40 -04:00
Shehzan Mohammed 2a00884875 Fix earcut compilation and cmake 2021-05-27 12:13:15 -04:00
Kevin Ring 50d5428855 Add option to prefix all sqlite3 symbols with cesium_. 2021-05-27 16:19:38 +10:00
Kevin Ring 51eed6b64a Revert changes to sqlite3.c/.h. 2021-05-27 10:38:54 +10:00
Nithin Pranesh d27509b046 moved earcut to cesium-native 2021-05-26 16:28:14 -04:00
Kevin Ring 8ce2000840 Hacky sqlite renaming. 2021-05-25 22:24:26 +10:00
Kevin Ring f9b697acc0 Better sqlite includes handling. 2021-05-25 22:06:45 +10:00
Kevin Ring 3ba3637056 Revert "Add MikkTSpace as an extern library."
This reverts commit d1102c6ac8.
2021-05-20 22:12:31 +10:00
Kevin Ring d1102c6ac8 Add MikkTSpace as an extern library.
It's currently not used.
2021-05-20 21:52:49 +10:00
Kevin Ring 33951541b7 magic_enum via cmake, tiny optimization, some cleanup. 2021-04-22 10:15:24 +10:00
Samuel Vargas ce4a15411c
Add cmake-modules as submodule 2021-04-20 13:47:10 -04:00
Samuel Vargas 3f657bca5c
Add magic_enum as a submodule 2021-04-19 17:01:28 -04:00
Samuel Vargas cd6e080a27
Remove magic_enum.hpp single file 2021-04-19 16:59:34 -04:00
Samuel Vargas cb595c1b55
Replace base64_encode.hpp with modp_b64 2021-04-19 16:57:03 -04:00
Samuel Vargas 8070d85023
Merge remote-tracking branch 'origin/main' into gltf-writer 2021-04-15 13:49:04 -04:00
Bao Tran cf94ed5d92 don't bring brotli when building cpp-http 2021-04-07 13:41:02 -04:00
Samuel Vargas 6babc551a0
Replace std::uint8_t with std::byte for data containers 2021-03-05 10:16:12 -05:00
Samuel Vargas e5f90d3b16
Add GSL_INCLUDE_DIR to target_include_directories
This is necessary to link against CesiumGltf as we use
gsl/narrow in JsonValue.h
2021-03-05 07:41:24 -05:00
Samuel Vargas c4f6025420
Add integer support to JsonValue
This also fixes a narrowing conversion bug. Previously if
a type that was larger than 2^53 was stored in a JsonValue
it would be silently casted into a double, causing an unexpected
precision loss. This changes JsonValue to use the largest signed,
unsigned, or floating point value available to support both types
of Numbers.

Also updates GSL version because they added a narrowing cast
function and we use that for safe type casting.
2021-03-05 07:41:15 -05:00
Samuel Vargas 33bdceca64
Add base64_encode and magic_enum
These libraries are needed for CesiumGltfWriter, the writer can automatically
convert binary data to base64 on behalf of the user. Magic enum is used
to automatically convert `CesiumGltf` enums to their string constants
without having to write a dedicated enum to string method.
2021-03-05 07:41:15 -05:00
Kevin Ring 68d711e1de Mark some libs private, remove commented-out code. 2021-03-05 14:21:55 +11:00
Kevin Ring 9346d3aee4 RapidJSON includes. 2021-03-05 14:14:52 +11:00
Kevin Ring da0b567120 Fix some install bits. 2021-03-05 14:04:28 +11:00
Kevin Ring 4743a46546 Merge remote-tracking branch 'origin/install' into install-with-exclude 2021-03-05 14:03:40 +11:00
Shehzan Mohammed 02272d99c8 Fix install steps 2021-03-04 18:10:59 -05:00
Kevin Ring 77a5a37720 Merge remote-tracking branch 'origin/install' into install-with-exclude 2021-03-05 08:17:30 +11:00
Kevin Ring c5e398275b Exclude extern directory.
But still (mostly?) install the right stuff.
2021-03-05 08:09:53 +11:00
Shehzan Mohammed 6e3224bd81 Add CMake Current Source Dir prefix in externs 2021-03-04 10:35:28 -05:00
Shehzan Mohammed cc549822d9 Update uriparser commit 2021-03-03 21:42:22 -05:00
Shehzan Mohammed 3faff010d7 Installing thirdparty deps working on linux 2021-03-03 20:47:31 -05:00
Kevin Ring bec2f0ca4c Don't mark libraries private (for now) 2021-03-04 10:46:56 +11:00
Kevin Ring 34bbd2aa31 WIP cmake install. 2021-03-04 09:48:09 +11:00
Samuel Vargas 05638d6c73
Add ctest support back in 2021-03-02 15:15:59 -05:00
Samuel Vargas 7f059ebbe7
Add missing newlines [skip ci] 2021-03-02 14:40:21 -05:00
Samuel Vargas 5d03477551
Rearchitecture cesium-native's CMake structure
This is necessary to support using cesium-native as submodule in
in asset-pipeline

- `draco` and `sqlite3` are guarded with if target blocks to allow
  asset-pipeline to provide their own version of the targets.
- Tests are now a dedicated target that clients don't have to build
- Test sources / headers are now a target property instead of using the $<BUILD_INTERFACE... hack
- Added common include variables in extern/CMakeLists.txt
- Defined `RAPIDJSON_HAS_CXX11_RVALUE_REFS` for move support for RapidJson
- Private include directories are automatically extracted via CMake magic
  for use in catch tests
- Globbing is now wrapped in a dedicated function that allows one to use
  CONFIGURE_DEPENDS depending on their preferences (defaults to OFF)
  to retain the old behavior.
2021-03-02 14:28:04 -05:00
Kevin Ring 1f2eb257ef Implement PKCE. 2021-02-28 22:51:57 +11:00
Kevin Ring 92eb8ae1de Include `state` in OAuth2 handshake. 2021-02-28 22:12:56 +11:00
Kevin Ring 5b616af8b0 Ion auth via OAuth2. 2021-02-25 22:48:22 +11:00
Kevin Ring fbbe928b68 Merge remote-tracking branch 'origin/master' into disk-cache 2021-02-19 11:54:26 +11:00
Marco Hutter 56733ab1e2 Remove glTF submodule 2021-02-03 16:41:38 +01:00
unknown 1f37dc6ce8 Merge branch 'disk-cache' of https://github.com/CesiumGS/cesium-native into disk-cache 2021-02-01 23:12:07 -05:00
unknown 947ae1ee95 fix gcc error 2021-02-01 23:11:51 -05:00
Kevin Ring db7b5226f6 Merge remote-tracking branch 'origin/master' into disk-cache 2021-02-02 15:07:05 +11:00
unknown a6eb04b40d print debug message cmake 2021-02-01 22:02:18 -05:00
unknown 3b831e3895 specify the directory for sqlite source 2021-02-01 16:42:38 -05:00
unknown 520ee7ad2f use CMAKE_CURRENT_SOURCE_DIR again 2021-01-31 21:55:38 -05:00
unknown 6d1df3c23c remove sqlite3_shell in cmake 2021-01-31 16:29:47 -05:00
Kevin Ring 243f48680b Add base64 decoding.
Mostly untested at the moment.
2021-01-27 23:52:43 +11:00
unknown 3dda96b36d change sqlite3 thread mode 2021-01-20 15:24:31 -05:00
Kevin Ring dfa5f01526 Remove tinygltf. 2021-01-20 14:32:30 +11:00
unknown e650526e08 create separate connection for each transaction 2021-01-14 17:10:57 -05:00
Kevin Ring 2b2c4a8b16 Add support for extensions, especially Draco. 2021-01-11 18:05:02 +11:00
Kevin Ring 32f0c371ea Raster image loading. 2021-01-08 23:10:27 +11:00
Kevin Ring 1c8bdac5ec Remove unused submodules. 2021-01-06 21:54:59 +11:00
Kevin Ring 232b87c84f Generate glTF classes from JSON Schema. 2021-01-05 21:21:15 +11:00
unknown 8d34afdff1 WIP: add sqlite3 and CachedAssetAccessor 2021-01-04 19:24:24 -05:00
Kevin Ring 306886b950 Merge remote-tracking branch 'origin/master' into gltf 2020-12-23 14:55:52 +11:00
Kevin Ring f4c932dab6 Use RapidJSON instead of nlohmann for tinygltf and tileset.json. 2020-12-21 16:15:51 +11:00
Kevin Ring 6cb6cddac0 Add simdjson. 2020-12-19 22:26:09 +11:00
Kevin Ring 63109a5fbb Use passed-in spdlog logger. 2020-12-17 16:30:33 +11:00
Marco Hutter 3efd0a8113 An attempt to move spdlog to the interface 2020-12-16 18:22:58 +01:00
Kevin Ring 7a0f1907af WIP transition to cgltf. 2020-12-08 14:02:09 +11:00
Kevin Ring 08708b4e02 Merge remote-tracking branch 'origin/spdlog-integration' into promises-plus-spdlog 2020-12-02 18:19:58 +11:00
Kevin Ring 786f574376 WIP async/promise-like system. 2020-11-24 21:22:46 +11:00