Skip to content

Commit 1505d2b

Browse files
authored
generate library_metadata.h in binary dir (#581)
1 parent 6abcd22 commit 1505d2b

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ endif()
161161

162162
target_include_directories(hikogui INTERFACE
163163
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
164-
"$<INSTALL_INTERFACE:include>"
165-
)
164+
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src/hikogui/metadata>"
165+
"$<INSTALL_INTERFACE:include>")
166166

167167
#
168168
# We will support the following CPUs:
@@ -442,6 +442,7 @@ if(WIN32 AND target_type STREQUAL DYNAMIC_LIBRARY)
442442
# Install the library and headers.
443443
install(TARGETS hikogui EXPORT hikogui
444444
FILE_SET hikogui_include_files DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
445+
FILE_SET hikogui_generated_include_files DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
445446
FILE_SET CXX_MODULES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
446447
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
447448
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -451,6 +452,7 @@ else()
451452
# Install the library and headers.
452453
install(TARGETS hikogui EXPORT hikogui
453454
FILE_SET hikogui_include_files DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
455+
FILE_SET hikogui_generated_include_files DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
454456
FILE_SET CXX_MODULES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
455457
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
456458
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

CMakeLists_includes.cmake

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11

22
configure_file(
33
${HIKOGUI_SOURCE_DIR}/metadata/library_metadata.hpp.in
4-
${HIKOGUI_SOURCE_DIR}/metadata/library_metadata.hpp @ONLY)
4+
${CMAKE_CURRENT_BINARY_DIR}/src/hikogui/metadata/library_metadata.hpp @ONLY)
55

6-
target_sources(hikogui INTERFACE FILE_SET hikogui_include_files TYPE HEADERS BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src/" FILES
6+
target_sources(hikogui INTERFACE FILE_SET hikogui_generated_include_files TYPE HEADERS BASE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/src/" FILES
7+
${CMAKE_CURRENT_BINARY_DIR}/src/hikogui/metadata/library_metadata.hpp
8+
)
9+
10+
target_sources(hikogui INTERFACE FILE_SET hikogui_include_files TYPE HEADERS BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src/" FILES
711
${HIKOGUI_SOURCE_DIR}/audio/audio_block.hpp
812
${HIKOGUI_SOURCE_DIR}/audio/audio_channel.hpp
913
${HIKOGUI_SOURCE_DIR}/audio/audio_device.hpp
@@ -354,7 +358,6 @@ target_sources(hikogui INTERFACE FILE_SET hikogui_include_files TYPE HEADERS BAS
354358
${HIKOGUI_SOURCE_DIR}/memory/memory.hpp
355359
${HIKOGUI_SOURCE_DIR}/memory/secure_memory_allocator.hpp
356360
${HIKOGUI_SOURCE_DIR}/metadata/application_metadata.hpp
357-
${HIKOGUI_SOURCE_DIR}/metadata/library_metadata.hpp # generated.
358361
${HIKOGUI_SOURCE_DIR}/metadata/metadata.hpp
359362
${HIKOGUI_SOURCE_DIR}/metadata/semantic_version.hpp
360363
${HIKOGUI_SOURCE_DIR}/net/module.hpp

0 commit comments

Comments
 (0)