diff --git a/CMakeLists.txt b/CMakeLists.txt index 94e55e2779..65062e460d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -255,7 +255,8 @@ configure_package_config_file( SVF_INSTALL_CMAKEDIR SVF_INSTALL_INCLUDEDIR SVF_EXTAPI_INSTALL_DIR - SVF_EXTAPI_INSTALL_FILE) + SVF_EXTAPI_INSTALL_FILE + CMAKE_INSTALL_INCLUDEDIR) # Actually install the configuration, versioning, and pkg_config files install(FILES ${PROJECT_BINARY_DIR}/SVFConfigVersion.cmake DESTINATION ${SVF_INSTALL_CMAKEDIR}) diff --git a/cmake/SVFConfig.cmake.in b/cmake/SVFConfig.cmake.in index 7c25290552..c635c78e40 100644 --- a/cmake/SVFConfig.cmake.in +++ b/cmake/SVFConfig.cmake.in @@ -23,6 +23,7 @@ set(SVF_INSTALL_CMAKEDIR "@PACKAGE_SVF_INSTALL_CMAKEDIR@") set(SVF_INSTALL_INCLUDEDIR "@PACKAGE_SVF_INSTALL_INCLUDEDIR@") set(SVF_INSTALL_EXTAPI_DIR "@PACKAGE_SVF_EXTAPI_INSTALL_DIR@") set(SVF_INSTALL_EXTAPI_FILE "@PACKAGE_SVF_EXTAPI_INSTALL_FILE@") +set(SVF_INSTALL_TOP_LVL_INCLUDEDIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") # Lastly derive exposed settings about SVF's build configuration set(SVF_SANITIZE "@SVF_SANITIZE@") @@ -39,35 +40,36 @@ set(SVF_CXX_STANDARD "@CMAKE_CXX_STANDARD@") set(SVF_ENABLE_EXCEPTIONS "@SVF_ENABLE_EXCEPTIONS@") message(STATUS "Found SVF Package: - SVF_SOURCE_DIR: ${SVF_SOURCE_DIR} - SVF_BUILD_DIR: ${SVF_BUILD_DIR} - - SVF_CORE_ROOT: ${SVF_CORE_ROOT} - SVF_CORE_SRCS: ${SVF_CORE_SRCS} - SVF_CORE_INCLUDES: ${SVF_CORE_INCLUDES} - - SVF_LLVM_ROOT: ${SVF_LLVM_ROOT} - SVF_LLVM_SRCS: ${SVF_LLVM_SRCS} - SVF_LLVM_TOOLS: ${SVF_LLVM_TOOLS} - SVF_LLVM_INCLUDES: ${SVF_LLVM_INCLUDES} - - SVF_INSTALL_BINDIR: ${SVF_INSTALL_BINDIR} - SVF_INSTALL_LIBDIR: ${SVF_INSTALL_LIBDIR} - SVF_INSTALL_CMAKEDIR: ${SVF_INSTALL_CMAKEDIR} - SVF_INSTALL_INCLUDEDIR: ${SVF_INSTALL_INCLUDEDIR} - SVF_INSTALL_EXTAPI_DIR: ${SVF_INSTALL_EXTAPI_DIR} - SVF_INSTALL_EXTAPI_FILE: ${SVF_INSTALL_EXTAPI_FILE} - - SVF_SANITIZE: ${SVF_SANITIZE} - SVF_COVERAGE: ${SVF_COVERAGE} - SVF_WARN_AS_ERROR: ${SVF_WARN_AS_ERROR} - SVF_EXPORT_DYNAMIC: ${SVF_EXPORT_DYNAMIC} - SVF_ENABLE_ASSERTIONS: ${SVF_ENABLE_ASSERTIONS} - SVF_ENABLE_OPAQUE_POINTERS: ${SVF_ENABLE_OPAQUE_POINTERS} - SVF_BUILD_TYPE: ${SVF_BUILD_TYPE} - SVF_ENABLE_RTTI: ${SVF_ENABLE_RTTI} - SVF_CXX_STANDARD: ${SVF_CXX_STANDARD} - SVF_ENABLE_EXCEPTIONS: ${SVF_EABLE_EXCEPTIONS}") + SVF_SOURCE_DIR: ${SVF_SOURCE_DIR} + SVF_BUILD_DIR: ${SVF_BUILD_DIR} + + SVF_CORE_ROOT: ${SVF_CORE_ROOT} + SVF_CORE_SRCS: ${SVF_CORE_SRCS} + SVF_CORE_INCLUDES: ${SVF_CORE_INCLUDES} + + SVF_LLVM_ROOT: ${SVF_LLVM_ROOT} + SVF_LLVM_SRCS: ${SVF_LLVM_SRCS} + SVF_LLVM_TOOLS: ${SVF_LLVM_TOOLS} + SVF_LLVM_INCLUDES: ${SVF_LLVM_INCLUDES} + + SVF_INSTALL_BINDIR: ${SVF_INSTALL_BINDIR} + SVF_INSTALL_LIBDIR: ${SVF_INSTALL_LIBDIR} + SVF_INSTALL_CMAKEDIR: ${SVF_INSTALL_CMAKEDIR} + SVF_INSTALL_INCLUDEDIR: ${SVF_INSTALL_INCLUDEDIR} + SVF_INSTALL_EXTAPI_DIR: ${SVF_INSTALL_EXTAPI_DIR} + SVF_INSTALL_EXTAPI_FILE: ${SVF_INSTALL_EXTAPI_FILE} + SVF_INSTALL_TOP_LVL_INCLUDEDIR: ${SVF_INSTALL_TOP_LVL_INCLUDEDIR} + + SVF_SANITIZE: ${SVF_SANITIZE} + SVF_COVERAGE: ${SVF_COVERAGE} + SVF_WARN_AS_ERROR: ${SVF_WARN_AS_ERROR} + SVF_EXPORT_DYNAMIC: ${SVF_EXPORT_DYNAMIC} + SVF_ENABLE_ASSERTIONS: ${SVF_ENABLE_ASSERTIONS} + SVF_ENABLE_OPAQUE_POINTERS: ${SVF_ENABLE_OPAQUE_POINTERS} + SVF_BUILD_TYPE: ${SVF_BUILD_TYPE} + SVF_ENABLE_RTTI: ${SVF_ENABLE_RTTI} + SVF_CXX_STANDARD: ${SVF_CXX_STANDARD} + SVF_ENABLE_EXCEPTIONS: ${SVF_EABLE_EXCEPTIONS}") include(CMakeFindDependencyMacro)