diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-10 15:38:33 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-08-10 15:38:59 (GMT) |
| commit | d6ee9b4a43210553b8f4d3a11413f744e2affb26 (patch) | |
| tree | c6906fa8cb507cef60894bed1e554072e941ca6f /Tests/InterfaceLibrary | |
| parent | e259ea433d7bf2c5a4858113dcf2e7079ae53b26 (diff) | |
| parent | bafa9fe8876387fa16cc8c03832d27df81238af1 (diff) | |
| download | CMake-d6ee9b4a43210553b8f4d3a11413f744e2affb26.zip CMake-d6ee9b4a43210553b8f4d3a11413f744e2affb26.tar.gz CMake-d6ee9b4a43210553b8f4d3a11413f744e2affb26.tar.bz2 | |
Merge topic 'build-interface-targets'
bafa9fe887 fileapi: Add INTERFACE libraries with SOURCES to codemodel-v2
4391913133 Add INTERFACE libraries to generated buildsystem if they have SOURCES
afb998704e Remove filtering of allowed INTERFACE library properties
e7edba2baf Makefiles: Use IsInBuildSystem in global generator target type checks
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5078
Diffstat (limited to 'Tests/InterfaceLibrary')
| -rw-r--r-- | Tests/InterfaceLibrary/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/InterfaceLibrary/definetestexe.cpp | 6 | ||||
| -rw-r--r-- | Tests/InterfaceLibrary/headerdir/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | Tests/InterfaceLibrary/headerdir/iface_genheader.h.in | 1 |
4 files changed, 17 insertions, 0 deletions
diff --git a/Tests/InterfaceLibrary/CMakeLists.txt b/Tests/InterfaceLibrary/CMakeLists.txt index 311ca2a..ec0a604 100644 --- a/Tests/InterfaceLibrary/CMakeLists.txt +++ b/Tests/InterfaceLibrary/CMakeLists.txt @@ -44,6 +44,7 @@ add_executable(InterfaceLibrary definetestexe.cpp) target_link_libraries(InterfaceLibrary iface_nodepends headeriface + iface_genheader subiface intermediate diff --git a/Tests/InterfaceLibrary/definetestexe.cpp b/Tests/InterfaceLibrary/definetestexe.cpp index 9156426..6c53840 100644 --- a/Tests/InterfaceLibrary/definetestexe.cpp +++ b/Tests/InterfaceLibrary/definetestexe.cpp @@ -15,6 +15,12 @@ # error Expected IFACE_HEADER_BUILDDIR #endif +#include "iface_genheader.h" + +#ifndef IFACE_GENHEADER +# error Expected IFACE_GENHEADER +#endif + extern int obj(); extern int sub(); extern int item(); diff --git a/Tests/InterfaceLibrary/headerdir/CMakeLists.txt b/Tests/InterfaceLibrary/headerdir/CMakeLists.txt index 826a9ed..ae030d7 100644 --- a/Tests/InterfaceLibrary/headerdir/CMakeLists.txt +++ b/Tests/InterfaceLibrary/headerdir/CMakeLists.txt @@ -11,3 +11,12 @@ add_custom_target(headeriface_gen VERBATIM ) add_dependencies(headeriface headeriface_gen) + +add_custom_command(OUTPUT iface_genheader.h + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_SOURCE_DIR}/iface_genheader.h.in + ${CMAKE_CURRENT_BINARY_DIR}/iface_genheader.h + DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/iface_genheader.h.in + VERBATIM) +add_library(iface_genheader INTERFACE iface_genheader.h) diff --git a/Tests/InterfaceLibrary/headerdir/iface_genheader.h.in b/Tests/InterfaceLibrary/headerdir/iface_genheader.h.in new file mode 100644 index 0000000..0a21b62 --- /dev/null +++ b/Tests/InterfaceLibrary/headerdir/iface_genheader.h.in @@ -0,0 +1 @@ +#define IFACE_GENHEADER |