build: use CMAKE_INCLUDE_CURRENT_DIR

This uses the CMake mechanism for including the current source and
binary directories.  This avoids the custom handling for this.
This commit is contained in:
Saleem Abdulrasool
2024-01-04 16:16:40 -08:00
parent 56fd1344df
commit bb3619e176
3 changed files with 6 additions and 2 deletions

View File

@@ -76,6 +76,8 @@ set(CMAKE_C_EXTENSIONS NO)
set(CMAKE_C_VISIBILITY_PRESET hidden)
set(CMAKE_VISIBILITY_INLINES_HIDDEN TRUE)
set(CMAKE_INCLUDE_CURRENT_DIR YES)
# Use CMake's generated headers instead of the Swift package prebuilt ones
add_compile_definitions(CMARK_USE_CMAKE_HEADERS)

View File

@@ -17,7 +17,7 @@ include_directories(
${PROJECT_BINARY_DIR}/src
)
include_directories(include ${CMAKE_CURRENT_BINARY_DIR})
include_directories(include)
if (CMARK_SHARED)
add_library(${LIBRARY} SHARED ${LIBRARY_SOURCES})

View File

@@ -33,7 +33,7 @@ set(LIBRARY_SOURCES
set(PROGRAM "cmark-gfm")
include_directories(include ${CMAKE_CURRENT_BINARY_DIR})
include_directories(include)
include_directories(
${PROJECT_SOURCE_DIR}/extensions/include
${PROJECT_BINARY_DIR}/extensions
@@ -56,6 +56,7 @@ endif()
if (CMARK_SHARED)
add_library(${LIBRARY} SHARED ${LIBRARY_SOURCES})
target_include_directories(${LIBRARY} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/extensions/include>)
target_link_libraries(${LIBRARY} PRIVATE
@@ -81,6 +82,7 @@ if (CMARK_STATIC)
target_compile_definitions(${STATICLIBRARY} PUBLIC
CMARK_GFM_STATIC_DEFINE)
target_include_directories(${LIBRARY} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/extensions/include>)
target_link_libraries(${STATICLIBRARY} PRIVATE