diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-04-24 12:39:54 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-04-24 13:58:05 +0200 |
| commit | d79febdde966f8becfbf2c0a4fdd4cd4ed4f2c25 (patch) | |
| tree | 0fa42e55e8aa480982d8f1d9561cbfffd3501c7d /cmake | |
| parent | 02785342acc1580210e6d69b5893c431ddc0c009 (diff) | |
| parent | 20b095c6b4b9bd394a4ad6062a588de5bbf14b52 (diff) | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
Change-Id: I90ef0063ed24e23bcb3d73fff086f50324faa1e2
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtCreatorAPI.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 82f7897b6d..993102e139 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -229,7 +229,11 @@ function(set_public_includes target includes) if (NOT IS_ABSOLUTE ${inc_dir}) set(inc_dir "${CMAKE_CURRENT_SOURCE_DIR}/${inc_dir}") endif() - target_include_directories(${target} PUBLIC $<BUILD_INTERFACE:${inc_dir}>) + file(RELATIVE_PATH include_dir_relative_path ${PROJECT_SOURCE_DIR} ${inc_dir}) + target_include_directories(${target} PUBLIC + $<BUILD_INTERFACE:${inc_dir}> + $<INSTALL_INTERFACE:include/${include_dir_relative_path}> + ) endforeach() endfunction() |