Skip to content

Commit d2560db

Browse files
committed
cmake install interface fixes
1 parent ead3daa commit d2560db

2 files changed

Lines changed: 3 additions & 12 deletions

File tree

cmake/pcre2cppConfig.cmake.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ if(mstd_FOUND AND NOT TARGET @PROJECT_NAMESPACE@mstd_imported)
3232
target_link_libraries(@PROJECT_NAMESPACE@mstd_imported INTERFACE mstd::mstd)
3333
endif()
3434

35-
set_and_check(@PROJECT_NAME@_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
36-
set(@PROJECT_NAME@_PCH_PATH "${@PROJECT_NAME@_INCLUDE_DIR}/@PROJECT_NAME@/pch.hpp")
37-
3835
if(NOT TARGET @PROJECT_NAMESPACE@@PROJECT_NAME@)
3936
include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake)
4037
endif()

pcre2cpp/CMakeLists.txt

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ if (PCRE2CPP_ENABLE_CLANG_TIDY)
3333
endif()
3434
# endregion
3535

36-
target_precompile_headers(${PROJECT_NAME} INTERFACE "$<BUILD_INTERFACE:${BUILD_HEADERS_DIR}/${PROJECT_NAME}/pch.hpp>"
37-
"$<INSTALL_INTERFACE:${pcre2cpp_PCH_PATH}>"
38-
)
36+
target_precompile_headers(${PROJECT_NAME} INTERFACE "$<BUILD_INTERFACE:${BUILD_HEADERS_DIR}/${PROJECT_NAME}/pch.hpp>")
3937

4038
target_compile_features(${PROJECT_NAME} INTERFACE $<BUILD_INTERFACE:$<IF:$<BOOL:${PCRE2CPP_ENABLE_CXX20}>, cxx_std_20, cxx_std_17>>)
4139

@@ -73,9 +71,7 @@ target_link_libraries(${PROJECT_NAME} INTERFACE
7371
# endregion
7472

7573
# set headers folder
76-
target_include_directories(${PROJECT_NAME} SYSTEM INTERFACE $<BUILD_INTERFACE:${BUILD_HEADERS_DIR}>
77-
$<INSTALL_INTERFACE:${INSTALL_HEADERS_DIR}>
78-
)
74+
target_include_directories(${PROJECT_NAME} INTERFACE $<BUILD_INTERFACE:${BUILD_HEADERS_DIR}>)
7975

8076
# region COMPILE_DEFINITIONS
8177
target_compile_definitions(${PROJECT_NAME} INTERFACE $<BUILD_INTERFACE:
@@ -161,7 +157,7 @@ if(PCRE2CPP_INSTALL)
161157
# Installing targets
162158
set(PROJECT_INSTALL_TARGETS ${PROJECT_NAME}Targets)
163159
install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
164-
INCLUDES DESTINATION ${INSTALL_HEADERS_PATH}
160+
INCLUDES DESTINATION ${INSTALL_HEADERS_DIR}
165161
)
166162

167163
# Generate Targets.cmake
@@ -175,12 +171,10 @@ if(PCRE2CPP_INSTALL)
175171
include(CMakePackageConfigHelpers)
176172

177173
set(PROJECT_INSTALL_CONFIG ${PROJECT_NAME}Config)
178-
set(INCLUDE_INSTALL_DIR ${INSTALL_HEADERS_DIR})
179174
configure_package_config_file(
180175
"${CMAKE_SOURCE_DIR}/cmake/${PROJECT_INSTALL_CONFIG}.cmake.in"
181176
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_INSTALL_CONFIG}.cmake"
182177
INSTALL_DESTINATION cmake
183-
PATH_VARS INCLUDE_INSTALL_DIR
184178
)
185179

186180
# Create Version.cmake

0 commit comments

Comments
 (0)