Merge pull request #434 from secure-software-engineering/f-FixesMissingLinkDeps

pdschubert · web-flow · commit 9e486e0e9696 · 2021-11-03T09:05:52.000+01:00
Fixes linking issues of taintconfig + json workaround
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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
diff --git a/lib/PhasarLLVM/DataFlowSolver/Mono/CMakeLists.txt b/lib/PhasarLLVM/DataFlowSolver/Mono/CMakeLists.txt
@@ -5,6 +5,7 @@ set(PHASAR_LINK_LIBS
   phasar_utils
   phasar_phasarllvm_utils
   phasar_db
+  phasar_taintconfig
 )
 
 set(LLVM_LINK_COMPONENTS
diff --git a/lib/PhasarLLVM/DataFlowSolver/Mono/phasar_mono-config.cmake b/lib/PhasarLLVM/DataFlowSolver/Mono/phasar_mono-config.cmake
@@ -11,6 +11,7 @@ list(APPEND
   utils
   phasarllvm_utils
   db
+  taintconfig
 )
 
 foreach(dep ${PHASAR_MONO_DEPS})
diff --git a/lib/PhasarLLVM/TaintConfig/CMakeLists.txt b/lib/PhasarLLVM/TaintConfig/CMakeLists.txt
@@ -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)
diff --git a/lib/PhasarLLVM/TaintConfig/phasar_taintconfig-config.cmake b/lib/PhasarLLVM/TaintConfig/phasar_taintconfig-config.cmake
@@ -3,6 +3,8 @@ set(PHASAR_taintconfig_COMPONENT_FOUND 1)
 list(APPEND
   PHASAR_TAINTCONFIG_DEPS
   utils
+  db
+  phasarllvm_utils
 )
 
 foreach(dep ${PHASAR_TAINTCONFIG_DEPS})

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ set(PHASAR_LINK_LIBS`
`5`	`5`	`phasar_utils`
`6`	`6`	`phasar_phasarllvm_utils`
`7`	`7`	`phasar_db`
	`8`	`+ phasar_taintconfig`
`8`	`9`	`)`
`9`	`10`
`10`	`11`	`set(LLVM_LINK_COMPONENTS`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ list(APPEND`
`11`	`11`	`utils`
`12`	`12`	`phasarllvm_utils`
`13`	`13`	`db`
	`14`	`+ taintconfig`
`14`	`15`	`)`
`15`	`16`
`16`	`17`	`foreach(dep ${PHASAR_MONO_DEPS})`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@ set(PHASAR_taintconfig_COMPONENT_FOUND 1)`
`3`	`3`	`list(APPEND`
`4`	`4`	`PHASAR_TAINTCONFIG_DEPS`
`5`	`5`	`utils`
	`6`	`+ db`
	`7`	`+ phasarllvm_utils`
`6`	`8`	`)`
`7`	`9`
`8`	`10`	`foreach(dep ${PHASAR_TAINTCONFIG_DEPS})`