Add target_include_directories to CMakefile (#113)
To tell clients where to find the public include directory, and attach it to the various library targets.
This commit is contained in:
parent
15a82c3efd
commit
a334ea2a34
|
@ -703,6 +703,7 @@ IF(PCRE2_BUILD_PCRE2_8)
|
||||||
VERSION ${LIBPCRE2_8_VERSION}
|
VERSION ${LIBPCRE2_8_VERSION}
|
||||||
SOVERSION ${LIBPCRE2_8_SOVERSION})
|
SOVERSION ${LIBPCRE2_8_SOVERSION})
|
||||||
TARGET_COMPILE_DEFINITIONS(pcre2-8-static PUBLIC PCRE2_STATIC)
|
TARGET_COMPILE_DEFINITIONS(pcre2-8-static PUBLIC PCRE2_STATIC)
|
||||||
|
TARGET_INCLUDE_DIRECTORIES(pcre2-8-static PUBLIC ${PROJECT_BINARY_DIR})
|
||||||
IF(REQUIRE_PTHREAD)
|
IF(REQUIRE_PTHREAD)
|
||||||
TARGET_LINK_LIBRARIES(pcre2-8-static Threads::Threads)
|
TARGET_LINK_LIBRARIES(pcre2-8-static Threads::Threads)
|
||||||
ENDIF(REQUIRE_PTHREAD)
|
ENDIF(REQUIRE_PTHREAD)
|
||||||
|
@ -716,6 +717,7 @@ IF(PCRE2_BUILD_PCRE2_8)
|
||||||
SOVERSION ${LIBPCRE2_POSIX_SOVERSION})
|
SOVERSION ${LIBPCRE2_POSIX_SOVERSION})
|
||||||
TARGET_LINK_LIBRARIES(pcre2-posix-static pcre2-8-static)
|
TARGET_LINK_LIBRARIES(pcre2-posix-static pcre2-8-static)
|
||||||
TARGET_COMPILE_DEFINITIONS(pcre2-posix-static PUBLIC PCRE2_STATIC)
|
TARGET_COMPILE_DEFINITIONS(pcre2-posix-static PUBLIC PCRE2_STATIC)
|
||||||
|
TARGET_INCLUDE_DIRECTORIES(pcre2-posix-static PUBLIC ${PROJECT_BINARY_DIR})
|
||||||
SET(targets ${targets} pcre2-posix-static)
|
SET(targets ${targets} pcre2-posix-static)
|
||||||
|
|
||||||
IF(MSVC)
|
IF(MSVC)
|
||||||
|
@ -732,6 +734,7 @@ IF(PCRE2_BUILD_PCRE2_8)
|
||||||
|
|
||||||
IF(BUILD_SHARED_LIBS)
|
IF(BUILD_SHARED_LIBS)
|
||||||
ADD_LIBRARY(pcre2-8-shared SHARED ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
|
ADD_LIBRARY(pcre2-8-shared SHARED ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
|
||||||
|
TARGET_INCLUDE_DIRECTORIES(pcre2-8-shared PUBLIC ${PROJECT_BINARY_DIR})
|
||||||
SET_TARGET_PROPERTIES(pcre2-8-shared PROPERTIES
|
SET_TARGET_PROPERTIES(pcre2-8-shared PROPERTIES
|
||||||
COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=8
|
COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=8
|
||||||
MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_8_MACHO_COMPATIBILITY_VERSION}"
|
MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_8_MACHO_COMPATIBILITY_VERSION}"
|
||||||
|
@ -744,6 +747,7 @@ IF(PCRE2_BUILD_PCRE2_8)
|
||||||
ENDIF(REQUIRE_PTHREAD)
|
ENDIF(REQUIRE_PTHREAD)
|
||||||
SET(targets ${targets} pcre2-8-shared)
|
SET(targets ${targets} pcre2-8-shared)
|
||||||
ADD_LIBRARY(pcre2-posix-shared SHARED ${PCRE2POSIX_HEADERS} ${PCRE2POSIX_SOURCES})
|
ADD_LIBRARY(pcre2-posix-shared SHARED ${PCRE2POSIX_HEADERS} ${PCRE2POSIX_SOURCES})
|
||||||
|
TARGET_INCLUDE_DIRECTORIES(pcre2-posix-shared PUBLIC ${PROJECT_BINARY_DIR})
|
||||||
SET_TARGET_PROPERTIES(pcre2-posix-shared PROPERTIES
|
SET_TARGET_PROPERTIES(pcre2-posix-shared PROPERTIES
|
||||||
COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=8
|
COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=8
|
||||||
MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_POSIX_MACHO_COMPATIBILITY_VERSION}"
|
MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_POSIX_MACHO_COMPATIBILITY_VERSION}"
|
||||||
|
@ -778,6 +782,7 @@ ENDIF(PCRE2_BUILD_PCRE2_8)
|
||||||
IF(PCRE2_BUILD_PCRE2_16)
|
IF(PCRE2_BUILD_PCRE2_16)
|
||||||
IF(BUILD_STATIC_LIBS)
|
IF(BUILD_STATIC_LIBS)
|
||||||
ADD_LIBRARY(pcre2-16-static STATIC ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
|
ADD_LIBRARY(pcre2-16-static STATIC ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
|
||||||
|
TARGET_INCLUDE_DIRECTORIES(pcre2-16-static PUBLIC ${PROJECT_BINARY_DIR})
|
||||||
SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES
|
SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES
|
||||||
COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=16
|
COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=16
|
||||||
MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
|
MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
|
||||||
|
@ -802,6 +807,7 @@ IF(PCRE2_BUILD_PCRE2_16)
|
||||||
|
|
||||||
IF(BUILD_SHARED_LIBS)
|
IF(BUILD_SHARED_LIBS)
|
||||||
ADD_LIBRARY(pcre2-16-shared SHARED ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
|
ADD_LIBRARY(pcre2-16-shared SHARED ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
|
||||||
|
TARGET_INCLUDE_DIRECTORIES(pcre2-16-shared PUBLIC ${PROJECT_BINARY_DIR})
|
||||||
SET_TARGET_PROPERTIES(pcre2-16-shared PROPERTIES
|
SET_TARGET_PROPERTIES(pcre2-16-shared PROPERTIES
|
||||||
COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=16
|
COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=16
|
||||||
MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
|
MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
|
||||||
|
@ -836,6 +842,7 @@ ENDIF(PCRE2_BUILD_PCRE2_16)
|
||||||
IF(PCRE2_BUILD_PCRE2_32)
|
IF(PCRE2_BUILD_PCRE2_32)
|
||||||
IF(BUILD_STATIC_LIBS)
|
IF(BUILD_STATIC_LIBS)
|
||||||
ADD_LIBRARY(pcre2-32-static STATIC ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
|
ADD_LIBRARY(pcre2-32-static STATIC ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
|
||||||
|
TARGET_INCLUDE_DIRECTORIES(pcre2-32-static PUBLIC ${PROJECT_BINARY_DIR})
|
||||||
SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES
|
SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES
|
||||||
COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=32
|
COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=32
|
||||||
MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
|
MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
|
||||||
|
@ -860,6 +867,7 @@ IF(PCRE2_BUILD_PCRE2_32)
|
||||||
|
|
||||||
IF(BUILD_SHARED_LIBS)
|
IF(BUILD_SHARED_LIBS)
|
||||||
ADD_LIBRARY(pcre2-32-shared SHARED ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
|
ADD_LIBRARY(pcre2-32-shared SHARED ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
|
||||||
|
TARGET_INCLUDE_DIRECTORIES(pcre2-32-shared PUBLIC ${PROJECT_BINARY_DIR})
|
||||||
SET_TARGET_PROPERTIES(pcre2-32-shared PROPERTIES
|
SET_TARGET_PROPERTIES(pcre2-32-shared PROPERTIES
|
||||||
COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=32
|
COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=32
|
||||||
MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
|
MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
|
||||||
|
|
Loading…
Reference in New Issue