Skip to content

CMake: prefer the vendored simdjson include path #3077

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

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

CMake: prefer the vendored simdjson include path #3077

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
7 changes: 6 additions & 1 deletion rts/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,12 @@ make_global_var(engineSources
${sources_engine_ExternalAI}
)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/lib/assimp/include) #FIXME: hack for rts/Rendering/Models/IModelParser.cpp
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/lib/simdjson/include)
# On macOS, locating DevIL via Homebrew pulls /opt/homebrew/include onto the
# global include path, where a transitively-installed Homebrew simdjson.h can
# shadow our vendored, version-matched copy and break the build (newer simdjson
# trips an AppleClang macro collision). Prepend so <simdjson.h> always resolves
# to the in-tree version on every platform.
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/lib/simdjson/include)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/lib/fastgltf/include)

### Add headers for generated project files (e.g. Code::Blocks)
Expand Down
Loading