Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nheko
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nheko Reborn
nheko
Commits
13d219e8
Verified
Commit
13d219e8
authored
2 years ago
by
Nicolas Werner
Browse files
Options
Downloads
Patches
Plain Diff
Add option to disable implicit json conversions
parent
ef941920
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#3812
failed
2 years ago
Stage: build
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+1
-0
1 addition, 0 deletions
.gitlab-ci.yml
CMakeLists.txt
+8
-0
8 additions, 0 deletions
CMakeLists.txt
with
9 additions
and
0 deletions
.gitlab-ci.yml
+
1
−
0
View file @
13d219e8
...
...
@@ -63,6 +63,7 @@ build-gcc9:
-DVOIP=OFF
-DCMAKE_BUILD_TYPE=Release -DHUNTER_CONFIGURATION_TYPES=Release
-DCI_BUILD=ON -DFETCHCONTENT_QUIET=OFF
-DJSON_ImplicitConversions=OFF
-
cmake --build build
after_script
:
-
mv ../.hunter .hunter
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
8
−
0
View file @
13d219e8
...
...
@@ -11,6 +11,7 @@ else()
option
(
MAN
"Build man page"
OFF
)
endif
()
option
(
FLATPAK
"Set this only if Nheko is built as a flatpak"
OFF
)
option
(
JSON_ImplicitConversions
"Disable implicit conversions in nlohmann/json"
ON
)
set
(
CMAKE_TOOLCHAIN_FILE
"
${
CMAKE_CURRENT_LIST_DIR
}
/toolchain.cmake"
...
...
@@ -686,6 +687,13 @@ if (USE_BUNDLED_QTKEYCHAIN)
target_include_directories
(
nheko PRIVATE
${
qt5keychain_SOURCE_DIR
}
${
qt5keychain_BINARY_DIR
}
)
endif
()
if
(
NOT JSON_ImplicitConversions
)
set_target_properties
(
nlohmann_json::nlohmann_json PROPERTIES
INTERFACE_COMPILE_DEFINITIONS
"JSON_USE_IMPLICIT_CONVERSIONS=
\$
<BOOL:OFF>;JSON_DIAGNOSTICS=
\$
<BOOL:OFF>"
)
target_compile_definitions
(
nheko PUBLIC JSON_USE_IMPLICIT_CONVERSIONS=0
)
endif
()
target_link_libraries
(
nheko PRIVATE
${
COEURL_TARGET_NAME
}
MatrixClient::MatrixClient
...
...
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