Mercurial > embed
changeset 63:b3c185090dc2
cmake: use BUILD_INTERFACE, closes #881 @10m
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Fri, 13 Jul 2018 12:32:37 +0200 |
| parents | 6b612e43bfee |
| children | 58ade32642d6 |
| files | duktape/CMakeLists.txt fmt/CMakeLists.txt gtest/CMakeLists.txt hoedown/CMakeLists.txt jansson/CMakeLists.txt json/CMakeLists.txt pugixml/CMakeLists.txt sqlite/CMakeLists.txt yaml/CMakeLists.txt |
| diffstat | 9 files changed, 34 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/duktape/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 +++ b/duktape/CMakeLists.txt Fri Jul 13 12:32:37 2018 +0200 @@ -19,6 +19,10 @@ cmake_minimum_required(VERSION 3.0) project(libduktape) add_library(libduktape STATIC duk_config.h duktape.cpp duktape.h) -target_include_directories(libduktape PUBLIC ${libduktape_SOURCE_DIR}) +target_include_directories( + libduktape + PUBLIC + $<BUILD_INTERFACE:${libduktape_SOURCE_DIR}> +) target_compile_definitions(libduktape PUBLIC DUK_OPT_CPP_EXCEPTIONS) set_target_properties(libduktape PROPERTIES PREFIX "")
--- a/fmt/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 +++ b/fmt/CMakeLists.txt Fri Jul 13 12:32:37 2018 +0200 @@ -19,5 +19,9 @@ cmake_minimum_required(VERSION 3.0) project(libfmt) add_library(libfmt STATIC format.cc format.h) -target_include_directories(libfmt PUBLIC ${libfmt_SOURCE_DIR}) +target_include_directories( + libfmt + PUBLIC + $<BUILD_INTERFACE:${libfmt_SOURCE_DIR}> +) set_target_properties(libfmt PROPERTIES PREFIX "")
--- a/gtest/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 +++ b/gtest/CMakeLists.txt Fri Jul 13 12:32:37 2018 +0200 @@ -23,10 +23,8 @@ target_include_directories( libgtest - PUBLIC - ${gtest_SOURCE_DIR}/include - PRIVATE - ${gtest_SOURCE_DIR} + PUBLIC $<BUILD_INTERFACE:${gtest_SOURCE_DIR}/include> + PRIVATE ${gtest_SOURCE_DIR} ) if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
--- a/hoedown/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 +++ b/hoedown/CMakeLists.txt Fri Jul 13 12:32:37 2018 +0200 @@ -46,7 +46,7 @@ add_library(libhoedown STATIC ${SOURCES} ${HEADERS}) target_include_directories( libhoedown - PUBLIC ${libhoedown_SOURCE_DIR}/include + PUBLIC $<BUILD_INTERFACE:${libhoedown_SOURCE_DIR}/include> PRIVATE ${libhoedown_SOURCE_DIR}/include/hoedown ) set_target_properties(libhoedown PROPERTIES PREFIX "")
--- a/jansson/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 +++ b/jansson/CMakeLists.txt Fri Jul 13 12:32:37 2018 +0200 @@ -259,7 +259,7 @@ target_include_directories( libjansson - PUBLIC ${libjansson_BINARY_DIR}/include + PUBLIC $<BUILD_INTERFACE:${libjansson_BINARY_DIR}/include> PRIVATE ${libjansson_BINARY_DIR}/private_include )
--- a/json/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 +++ b/json/CMakeLists.txt Fri Jul 13 12:32:37 2018 +0200 @@ -19,5 +19,9 @@ cmake_minimum_required(VERSION 3.0) project(libjson) add_library(libjson INTERFACE) -target_include_directories(libjson INTERFACE ${libjson_SOURCE_DIR}) +target_include_directories( + libjson + INTERFACE + $<BUILD_INTERFACE:${libjson_SOURCE_DIR}> +) target_sources(libjson INTERFACE ${libjson_SOURCE_DIR}/json.hpp)
--- a/pugixml/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 +++ b/pugixml/CMakeLists.txt Fri Jul 13 12:32:37 2018 +0200 @@ -27,5 +27,9 @@ ) add_library(libpugixml STATIC ${SOURCES}) -target_include_directories(libpugixml PUBLIC ${libpugixml_SOURCE_DIR}/src) +target_include_directories( + libpugixml + PUBLIC + $<BUILD_INTERFACE:${libpugixml_SOURCE_DIR}/src> +) set_target_properties(libpugixml PROPERTIES PREFIX "")
--- a/sqlite/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 +++ b/sqlite/CMakeLists.txt Fri Jul 13 12:32:37 2018 +0200 @@ -19,8 +19,12 @@ cmake_minimum_required(VERSION 3.5) project(libsqlite C) add_library(libsqlite STATIC CMakeLists.txt sqlite3.c sqlite3ext.h sqlite3.h) -target_include_directories(libsqlite PUBLIC ${libsqlite_SOURCE_DIR}) set_target_properties(libsqlite PROPERTIES PREFIX "") +target_include_directories( + libsqlite + PUBLIC + $<BUILD_INTERFACE:${libsqlite_SOURCE_DIR}> +) target_link_libraries( libsqlite $<$<STREQUAL:${CMAKE_SYSTEM_NAME},Linux>:dl>
--- a/yaml/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 +++ b/yaml/CMakeLists.txt Fri Jul 13 12:32:37 2018 +0200 @@ -38,9 +38,13 @@ ) add_library(libyaml STATIC ${SOURCES}) -target_include_directories(libyaml PUBLIC ${libyaml_SOURCE_DIR}/include) set_target_properties(libyaml PROPERTIES PREFIX "") +target_include_directories( + libyaml + PUBLIC + $<BUILD_INTERFACE:${libyaml_SOURCE_DIR}/include> +) target_compile_definitions( libyaml PRIVATE