Skip to content
Snippets Groups Projects
Commit 8458616a authored by Christoph Lehmann's avatar Christoph Lehmann Committed by Dmitri Naumov
Browse files

Rename local nlohmann_json::nlohmann_json target.

Naming it same as in an externally found library.
parent e2963065
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,7 @@ if(OGS_BUILD_CLI OR OGS_BUILD_UTILS OR OGS_BUILD_TESTING) ...@@ -23,7 +23,7 @@ if(OGS_BUILD_CLI OR OGS_BUILD_UTILS OR OGS_BUILD_TESTING)
PRIVATE ParameterLib ProcessLib PRIVATE ParameterLib ProcessLib
) )
elseif(OGS_BUILD_GUI) elseif(OGS_BUILD_GUI)
target_link_libraries(ApplicationsLib PRIVATE nlohmann_json) target_link_libraries(ApplicationsLib PRIVATE nlohmann_json::nlohmann_json)
endif() endif()
if(OGS_USE_LIS) if(OGS_USE_LIS)
......
...@@ -35,7 +35,7 @@ target_link_libraries( ...@@ -35,7 +35,7 @@ target_link_libraries(
NumLib NumLib
$<$<TARGET_EXISTS:ProcessLibBoundaryConditionAndSourceTermPython>:ProcessLibBoundaryConditionAndSourceTermPython> $<$<TARGET_EXISTS:ProcessLibBoundaryConditionAndSourceTermPython>:ProcessLibBoundaryConditionAndSourceTermPython>
$<$<TARGET_EXISTS:petsc>:petsc> $<$<TARGET_EXISTS:petsc>:petsc>
nlohmann_json nlohmann_json::nlohmann_json
PRIVATE ParameterLib GitInfoLib $<$<TARGET_EXISTS:InSituLib>:InSituLib> PRIVATE ParameterLib GitInfoLib $<$<TARGET_EXISTS:InSituLib>:InSituLib>
) )
......
...@@ -307,9 +307,9 @@ CPMFindPackage( ...@@ -307,9 +307,9 @@ CPMFindPackage(
SHA256=69cc88207ce91347ea530b227ff0776db82dcb8de6704e1a3d74f4841bc651cf SHA256=69cc88207ce91347ea530b227ff0776db82dcb8de6704e1a3d74f4841bc651cf
) )
if(nlohmann_json_ADDED) if(nlohmann_json_ADDED)
add_library(nlohmann_json INTERFACE IMPORTED) add_library(nlohmann_json::nlohmann_json INTERFACE IMPORTED)
target_include_directories( target_include_directories(
nlohmann_json INTERFACE ${nlohmann_json_SOURCE_DIR} nlohmann_json::nlohmann_json INTERFACE ${nlohmann_json_SOURCE_DIR}
) )
endif() endif()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment