Skip to content

Fixes linking issues of taintconfig + json workaround #434

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

Merged
pdschubert merged 3 commits into from
Nov 3, 2021
Merged

Fixes linking issues of taintconfig + json workaround #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2930033
Fixes linking issues of taintconfig + json workaround
vulder Nov 2, 2021
c036ce6
add previously added deps to respective .cmake files as well
Nov 2, 2021
50a2af2
Merge branch 'development' into f-FixesMissingLinkDeps
pdschubert Nov 3, 2021
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
5 changes: 5 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,11 @@ set(BUILD_TESTS OFF CACHE BOOL "Build json-schema-validator-tests")

# Make nlohmann_json_schema_validator happy by telling it how to find the single include of nlohmann_json
include_directories(external/json/single_include/)

if (PHASAR_IN_TREE)
set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS nlohmann_json_schema_validator)
endif()

set(nlohmann_json_DIR ${PHASAR_SRC_DIR}/external/json/single_include/)

# Json Schema Validator
Expand Down
1 change: 1 addition & 0 deletions lib/PhasarLLVM/DataFlowSolver/Mono/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ set(PHASAR_LINK_LIBS
phasar_utils
phasar_phasarllvm_utils
phasar_db
phasar_taintconfig
)

set(LLVM_LINK_COMPONENTS
Expand Down
1 change: 1 addition & 0 deletions lib/PhasarLLVM/DataFlowSolver/Mono/phasar_mono-config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ list(APPEND
utils
phasarllvm_utils
db
taintconfig
)

foreach(dep ${PHASAR_MONO_DEPS})
Expand Down
7 changes: 7 additions & 0 deletions lib/PhasarLLVM/TaintConfig/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ file(GLOB_RECURSE TAINTCONFIG_SRC *.h *.cpp)

set(PHASAR_LINK_LIBS
phasar_utils
phasar_db
phasar_phasarllvm_utils
)

set(LLVM_LINK_COMPONENTS
Core
Support
)

if(BUILD_SHARED_LIBS)
Expand Down
2 changes: 2 additions & 0 deletions lib/PhasarLLVM/TaintConfig/phasar_taintconfig-config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ set(PHASAR_taintconfig_COMPONENT_FOUND 1)
list(APPEND
PHASAR_TAINTCONFIG_DEPS
utils
db
phasarllvm_utils
)

foreach(dep ${PHASAR_TAINTCONFIG_DEPS})
Expand Down