Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
956a7ba4
Commit
956a7ba4
authored
5 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Add meshoptimizer dep
parent
a906d1c3
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
indra/CMakeLists.txt
+2
-0
2 additions, 0 deletions
indra/CMakeLists.txt
indra/deps/CMakeLists.txt
+68
-0
68 additions, 0 deletions
indra/deps/CMakeLists.txt
indra/llmath/CMakeLists.txt
+2
-0
2 additions, 0 deletions
indra/llmath/CMakeLists.txt
with
72 additions
and
0 deletions
indra/CMakeLists.txt
+
2
−
0
View file @
956a7ba4
...
@@ -22,6 +22,8 @@ endif (NOT CMAKE_BUILD_TYPE)
...
@@ -22,6 +22,8 @@ endif (NOT CMAKE_BUILD_TYPE)
add_subdirectory
(
cmake
)
add_subdirectory
(
cmake
)
add_subdirectory
(
deps
)
add_subdirectory
(
${
LIBS_OPEN_PREFIX
}
llaudio
)
add_subdirectory
(
${
LIBS_OPEN_PREFIX
}
llaudio
)
add_subdirectory
(
${
LIBS_OPEN_PREFIX
}
llappearance
)
add_subdirectory
(
${
LIBS_OPEN_PREFIX
}
llappearance
)
add_subdirectory
(
${
LIBS_OPEN_PREFIX
}
llcharacter
)
add_subdirectory
(
${
LIBS_OPEN_PREFIX
}
llcharacter
)
...
...
This diff is collapsed.
Click to expand it.
indra/deps/CMakeLists.txt
0 → 100644
+
68
−
0
View file @
956a7ba4
project
(
deps
)
include
(
00-Common
)
include
(
FetchContent
)
set
(
CMAKE_FOLDER
"Third Party"
)
set
(
CMAKE_POSITION_INDEPENDENT_CODE ON
)
FetchContent_Declare
(
meshoptimizer
GIT_REPOSITORY https://github.com/zeux/meshoptimizer.git
GIT_TAG v0.14
)
# FetchContent_Declare(
# Catch2
# GIT_REPOSITORY https://github.com/catchorg/Catch2.git
# GIT_TAG v2.11.0
# )
# FetchContent_Declare(
# fmt
# GIT_REPOSITORY https://github.com/fmtlib/fmt.git
# GIT_TAG 6.1.2
# )
# FetchContent_Declare(
# nlohmann_json
# GIT_REPOSITORY https://github.com/nlohmann/json.git
# GIT_TAG v3.7.3
# )
# FetchContent_Declare(
# absl
# GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git
# GIT_TAG cde2e2410e58c884b3bf5f67c6511e6266036249
# )
# # This is a hack because absl has dumb cmake
# set(OLD_BUILD_TEST ${BUILD_TESTING})
# set(BUILD_TESTING OFF)
# FetchContent_MakeAvailable(absl)
# set(BUILD_TESTING ${OLD_BUILD_TEST})
# # Supress warnings inside abseil under MSVC
# if(WINDOWS)
# target_compile_options(absl_strings PRIVATE /wd4018)
# target_compile_options(absl_str_format_internal PRIVATE /wd4018)
# target_compile_options(absl_flags_usage_internal PRIVATE /wd4018)
# endif()
# if (BUILD_TESTING)
# FetchContent_MakeAvailable(Catch2)
# endif()
# #Download the rest of the libraries
# FetchContent_MakeAvailable(fmt)
FetchContent_MakeAvailable
(
meshoptimizer
)
# # Typically you don't care so much for a third party library's tests to be
# # run from your own project's code.
# set(JSON_BuildTests OFF CACHE INTERNAL "")
# # If you only include this third party in PRIVATE source files, you do not
# # need to install it when your main project gets installed.
# set(JSON_Install OFF CACHE INTERNAL "")
# FetchContent_MakeAvailable(nlohmann_json)
unset
(
CMAKE_FOLDER
)
unset
(
CMAKE_POSITION_INDEPENDENT_CODE
)
This diff is collapsed.
Click to expand it.
indra/llmath/CMakeLists.txt
+
2
−
0
View file @
956a7ba4
...
@@ -108,7 +108,9 @@ list(APPEND llmath_SOURCE_FILES ${llmath_HEADER_FILES})
...
@@ -108,7 +108,9 @@ list(APPEND llmath_SOURCE_FILES ${llmath_HEADER_FILES})
add_library
(
llmath
${
llmath_SOURCE_FILES
}
)
add_library
(
llmath
${
llmath_SOURCE_FILES
}
)
target_link_libraries
(
llmath
target_link_libraries
(
llmath
PUBLIC
${
LLCOMMON_LIBRARIES
}
${
LLCOMMON_LIBRARIES
}
meshoptimizer
)
)
# Add tests
# Add tests
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment