Skip to content

Commit 2930033

Browse files
committed
Fixes linking issues of taintconfig + json workaround
Fixes linking issues of taintconfig and adds a workaround to include the schema validator in LLVM_EXPORT for in tree builds, so llvm correctly installs the schema lib alongside it's tools/libs.
1 parent fb560cf commit 2930033

3 files changed

Lines changed: 11 additions & 0 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ include_directories(${Boost_INCLUDE_DIRS})
121121
option(JSON_BuildTests OFF)
122122
add_subdirectory(external/json EXCLUDE_FROM_ALL)
123123
include_directories(external/json/single_include/)
124+
if (PHASAR_IN_TREE)
125+
set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS nlohmann_json_schema_validator)
126+
endif()
124127

125128
# Googletest
126129
if (NOT PHASAR_IN_TREE)

lib/PhasarLLVM/DataFlowSolver/Mono/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ set(PHASAR_LINK_LIBS
55
phasar_utils
66
phasar_phasarllvm_utils
77
phasar_db
8+
phasar_taintconfig
89
)
910

1011
set(LLVM_LINK_COMPONENTS

lib/PhasarLLVM/TaintConfig/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ file(GLOB_RECURSE TAINTCONFIG_SRC *.h *.cpp)
22

33
set(PHASAR_LINK_LIBS
44
phasar_utils
5+
phasar_db
6+
phasar_phasarllvm_utils
7+
)
8+
9+
set(LLVM_LINK_COMPONENTS
10+
Core
11+
Support
512
)
613

714
if(BUILD_SHARED_LIBS)

0 commit comments

Comments
 (0)