King_DuckZ/kamokan
1
0
Fork 0
mirror of https://github.com/KingDuckZ/kamokan.git synced 2024-11-23 00:33:44 +00:00
Code Issues Releases Wiki Activity

Update SourceHighlight cmake to use the new style.

Browse source
This commit is contained in:
King_DuckZ 2017-08-08 10:26:05 +01:00
parent 4837f61601
commit 0f6eee2ade
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmake/modules/FindSourceHighlight.cmake
View file

@ -34,6 +34,16 @@ else(SourceHighlight_INCLUDE_DIR AND SourceHighlight_LIBRARIES AND Ncurses_LIBRA
mark_as_advanced(SourceHighlight_INCLUDE_DIR SourceHighlight_LIBRARIES) mark_as_advanced(SourceHighlight_INCLUDE_DIR SourceHighlight_LIBRARIES)
endif(SourceHighlight_INCLUDE_DIR AND SourceHighlight_LIBRARIES AND Ncurses_LIBRARY) endif(SourceHighlight_INCLUDE_DIR AND SourceHighlight_LIBRARIES AND Ncurses_LIBRARY)
if (SourceHighlight_FOUND AND NOT TARGET SourceHighlight::SourceHighlight)
add_library(SourceHighlight::SourceHighlight INTERFACE IMPORTED)
set_property(TARGET SourceHighlight::SourceHighlight
PROPERTY INTERFACE_LINK_LIBRARIES "${SourceHighlight_LIBRARIES}"
)
set_property(TARGET SourceHighlight::SourceHighlight
PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${SourceHighlight_INCLUDE_DIR}"
)
endif()
mark_as_advanced( mark_as_advanced(
SourceHighlight_INCLUDE_DIR SourceHighlight_INCLUDE_DIR
SourceHighlight_LIBRARIES SourceHighlight_LIBRARIES

3
src/kamokan_impl/CMakeLists.txt
View file

@ -37,7 +37,6 @@ target_include_directories(${PROJECT_NAME}
target_include_directories(${PROJECT_NAME} SYSTEM target_include_directories(${PROJECT_NAME} SYSTEM
PUBLIC ${Boost_INCLUDE_DIRS} PUBLIC ${Boost_INCLUDE_DIRS}
PUBLIC ${TAWASHI_SOURCE_ROOT}/lib/better-enums PUBLIC ${TAWASHI_SOURCE_ROOT}/lib/better-enums
PRIVATE ${SourceHighlight_INCLUDE_DIR}
PRIVATE ${TAWASHI_SOURCE_ROOT}/lib/utf8_v2_3_4/source PRIVATE ${TAWASHI_SOURCE_ROOT}/lib/utf8_v2_3_4/source
PUBLIC ${TAWASHI_SOURCE_ROOT}/lib/spdlog/include PUBLIC ${TAWASHI_SOURCE_ROOT}/lib/spdlog/include
PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/include PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/include
@ -45,7 +44,7 @@ target_include_directories(${PROJECT_NAME} SYSTEM
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
PRIVATE ${Boost_LIBRARIES} PRIVATE ${Boost_LIBRARIES}
PRIVATE incredis PRIVATE incredis
PRIVATE ${SourceHighlight_LIBRARIES} PRIVATE SourceHighlight::SourceHighlight
PUBLIC mstch PUBLIC mstch
PRIVATE Threads::Threads PRIVATE Threads::Threads
PUBLIC tawashi PUBLIC tawashi