svf-tools 1.0.883 → 1.0.884

package/.config.cmake.in

@@ -3,7 +3,17 @@
 set_and_check(SVF_INSTALL_ROOT "@PACKAGE_SVF_INSTALL_ROOT@")
 set_and_check(SVF_INSTALL_BIN_DIR "@PACKAGE_SVF_INSTALL_BIN_DIR@")
 set_and_check(SVF_INSTALL_LIB_DIR "@PACKAGE_SVF_INSTALL_LIB_DIR@")
-set_and_check(SVF_INSTALL_INCLUDE_DIR "@PACKAGE_SVF_INSTALL_INCLUDE_DIR@")
+
+set(SVF_INCLUDE_PATH "@PACKAGE_SVF_INSTALL_ROOT@/../svf/include")
+set(SVF_LLVM_INCLUDE_PATH "@PACKAGE_SVF_INSTALL_ROOT@/../svf-llvm/include")
+
+if(EXISTS ${SVF_INCLUDE_PATH} AND EXISTS ${SVF_LLVM_INCLUDE_PATH})
+    set(SVF_INSTALL_INCLUDE_DIR "${SVF_INCLUDE_PATH};${SVF_LLVM_INCLUDE_PATH};@PACKAGE_SVF_INSTALL_INCLUDE_DIR@")
+else()
+    set_and_check(SVF_INSTALL_INCLUDE_DIR "@PACKAGE_SVF_INSTALL_INCLUDE_DIR@")
+endif()
+
+message(STATUS "SVF_INSTALL_INCLUDE_DIR is set to: ${SVF_INSTALL_INCLUDE_DIR}")
 
 set_and_check(SVF_INSTALL_EXTAPI_DIR "@PACKAGE_SVF_INSTALL_EXTAPI_DIR@")
 set_and_check(SVF_INSTALL_EXTAPI_FILE "@PACKAGE_SVF_INSTALL_EXTAPI_FILE@")
@@ -21,4 +31,4 @@ set(SVF_CXX_STANDARD "@CMAKE_CXX_STANDARD@")
 set(SVF_ENABLE_RTTI "@SVF_ENABLE_RTTI@")
 set(SVF_ENABLE_EXCEPTIONS "@SVF_ENABLE_EXCEPTIONS@")
 
-include("${CMAKE_CURRENT_LIST_DIR}/SVFTargets.cmake")
+

package/CMakeLists.txt

@@ -175,13 +175,3 @@ install(
     ${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/SVF/SVFConfigVersion.cmake
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/SVF
 )
-
-# Install CMake targets from different SVF subprojects so they can be found by find_package(SVF)
-install(
-  EXPORT SVFTargets
-  FILE SVFTargets.cmake
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/SVF
-)
-
-# Export targets added to SVFTargets (set by install() command)
-export(EXPORT SVFTargets FILE "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/SVF/SVFTargets.cmake")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.883",
+  "version": "1.0.884",
   "description": "* <b>[TypeClone](https://github.com/SVF-tools/SVF/wiki/TypeClone) published in our [ECOOP paper](https://yuleisui.github.io/publications/ecoop20.pdf) is now available in SVF </b> * <b>SVF now uses a single script for its build. Just type [`source ./build.sh`](https://github.com/SVF-tools/SVF/blob/master/build.sh) in your terminal, that's it!</b> * <b>SVF now supports LLVM-10.0.0! </b> * <b>We thank [bsauce](https://github.com/bsauce) for writing a user manual of SVF ([link1](https://www.jianshu.com/p/068a08ec749c) and [link2](https://www.jianshu.com/p/777c30d4240e)) in Chinese </b> * <b>SVF now supports LLVM-9.0.0 (Thank [Byoungyoung Lee](https://github.com/SVF-tools/SVF/issues/142) for his help!). </b> * <b>SVF now supports a set of [field-sensitive pointer analyses](https://yuleisui.github.io/publications/sas2019a.pdf). </b> * <b>[Use SVF as an external lib](https://github.com/SVF-tools/SVF/wiki/Using-SVF-as-a-lib-in-your-own-tool) for your own project (Contributed by [Hongxu Chen](https://github.com/HongxuChen)). </b> * <b>SVF now supports LLVM-7.0.0. </b> * <b>SVF now supports Docker. [Try SVF in Docker](https://github.com/SVF-tools/SVF/wiki/Try-SVF-in-Docker)! </b> * <b>SVF now supports [LLVM-6.0.0](https://github.com/svf-tools/SVF/pull/38) (Contributed by [Jack Anthony](https://github.com/jackanth)). </b> * <b>SVF now supports [LLVM-4.0.0](https://github.com/svf-tools/SVF/pull/23) (Contributed by Jared Carlson. Thank [Jared](https://github.com/jcarlson23) and [Will](https://github.com/dtzWill) for their in-depth [discussions](https://github.com/svf-tools/SVF/pull/18) about updating SVF!) </b> * <b>SVF now supports analysis for C++ programs.</b> <br />",
   "main": "index.js",
   "scripts": {

package/svf/CMakeLists.txt

@@ -21,11 +21,6 @@ target_sources(SvfCore PRIVATE ${SVF_CORE_SOURCES})
 # Get all of the public header files (i.e. all *.h/*.hpp files) for SVF's subprojects and add them
 file(GLOB_RECURSE SVF_CORE_HEADERS include/*.h include/*.hpp)
 
-add_custom_target(CopySVFIncludeFiles ALL
-        COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/
-        ${CMAKE_BINARY_DIR}/include)
-
 target_sources(SvfCore
   PUBLIC
     FILE_SET HEADERS
@@ -33,8 +28,6 @@ target_sources(SvfCore
     FILES ${SVF_CORE_HEADERS}
 )
 
-add_dependencies(SvfCore CopySVFIncludeFiles)
-
 # Install the headers and compiled libraries (associate SvfCore with the SVF package's targets)
 install(
   TARGETS SvfCore

package/svf-llvm/CMakeLists.txt

@@ -88,10 +88,6 @@ target_sources(SvfLLVM PRIVATE ${SVF_LLVM_SOURCES})
 
 # Get all of the public header files (i.e. all *.h/*.hpp files) for SVF's subprojects and add them
 file(GLOB_RECURSE SVF_LLVM_HEADERS include/*.h include/*.hpp)
-add_custom_target(CopySVFLLVMIncludeFiles ALL
-        COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/
-        ${CMAKE_BINARY_DIR}/include)
 
 target_sources(SvfLLVM
   PUBLIC
@@ -100,8 +96,6 @@ target_sources(SvfLLVM
     FILES ${SVF_LLVM_HEADERS}
 )
 
-add_dependencies(SvfCore CopySVFLLVMIncludeFiles CopySVFIncludeFiles)
-
 # Add intrinsics_gen target if we're building as part of LLVM source build
 if(TARGET intrinsics_gen)
   add_dependencies(SvfLLVM intrinsics_gen)