reduce copy include

SVF-tools · Feb 14, 2024 · 36d4176 · 36d4176
1 parent cda280b
commit 36d4176
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/.config.cmake.in b/.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,3 +31,4 @@ set(SVF_CXX_STANDARD "@CMAKE_CXX_STANDARD@")
 set(SVF_ENABLE_RTTI "@SVF_ENABLE_RTTI@")
 set(SVF_ENABLE_EXCEPTIONS "@SVF_ENABLE_EXCEPTIONS@")
 
+
diff --git a/.github/workflows/svf-lib_publish.yml b/.github/workflows/svf-lib_publish.yml
@@ -120,6 +120,8 @@ jobs:
             rm -rf $GITHUB_WORKSPACE/Release-build/bin/*.dot
             rm -rf $GITHUB_WORKSPACE/Release-build/bin/*.json
             cp -rf $GITHUB_WORKSPACE/Release-build/include SVF-${osVersion}/Release-build/
+            cp -rf $GITHUB_WORKSPACE/svf/include SVF-${osVersion}/Release-build/
+            cp -rf $GITHUB_WORKSPACE/svf-llvm/include SVF-${osVersion}/Release-build/
             cp -rf $GITHUB_WORKSPACE/Release-build/lib SVF-${osVersion}/Release-build/
             cp -rf $GITHUB_WORKSPACE/Release-build/bin SVF-${osVersion}/Release-build/
             git add .

diff --git a/svf-llvm/CMakeLists.txt b/svf-llvm/CMakeLists.txt
@@ -96,10 +96,6 @@ target_sources(SvfLLVM
     FILES ${SVF_LLVM_HEADERS}
 )
 
-add_custom_command(TARGET SvfLLVM POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include)
-
 # Add intrinsics_gen target if we're building as part of LLVM source build
 if(TARGET intrinsics_gen)
   add_dependencies(SvfLLVM intrinsics_gen)

diff --git a/svf/CMakeLists.txt b/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_command(TARGET SvfCore POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include)
-
 target_sources(SvfCore
   PUBLIC
     FILE_SET HEADERS