Skip to content

Commit 7ca371f

Browse files
authored
Configure namespace.h into cmake binary dir instead of source (#439)
1 parent 679253b commit 7ca371f

File tree

5 files changed

+19
-8
lines changed

5 files changed

+19
-8
lines changed

CMakeLists.txt

+7-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
3030

3131
configure_file(
3232
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/namespace.h.in"
33-
"${CMAKE_CURRENT_SOURCE_DIR}/include/namespace.h"
33+
"${CMAKE_CURRENT_BINARY_DIR}/include/namespace.h"
3434
@ONLY
3535
)
3636

@@ -123,9 +123,10 @@ add_subdirectory(third_party)
123123
set(LIB_NAME "${PROJECT_NAME}")
124124

125125
file(GLOB_RECURSE LIB_HEADERS CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
126+
file(GLOB_RECURSE LIB_GENERATED_HEADERS CONFIGURE_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/include/*.h")
126127
file(GLOB_RECURSE LIB_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
127128

128-
add_library(${LIB_NAME} ${LIB_HEADERS} ${LIB_SOURCES})
129+
add_library(${LIB_NAME} ${LIB_HEADERS} ${LIB_GENERATED_HEADERS} ${LIB_SOURCES})
129130
add_dependencies(${LIB_NAME} bytes tls_syntax hpke)
130131
target_link_libraries(${LIB_NAME}
131132
PRIVATE
@@ -134,7 +135,8 @@ target_link_libraries(${LIB_NAME}
134135
bytes tls_syntax hpke)
135136
target_include_directories(${LIB_NAME}
136137
PUBLIC
137-
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
138+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
139+
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
138140
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>
139141
)
140142

@@ -186,7 +188,8 @@ install(
186188

187189
install(
188190
DIRECTORY
189-
include/
191+
${CMAKE_CURRENT_SOURCE_DIR}/include/
192+
${CMAKE_CURRENT_BINARY_DIR}/include/
190193
DESTINATION
191194
${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
192195

lib/bytes/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@ set(CURRENT_LIB_NAME bytes)
55
###
66

77
file(GLOB_RECURSE LIB_HEADERS CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
8+
file(GLOB_RECURSE LIB_GENERATED_HEADERS CONFIGURE_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/include/*.h")
89
file(GLOB_RECURSE LIB_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
910

10-
add_library(${CURRENT_LIB_NAME} ${LIB_HEADERS} ${LIB_SOURCES})
11+
add_library(${CURRENT_LIB_NAME} ${LIB_HEADERS} ${LIB_GENERATED_HEADERS} ${LIB_SOURCES})
1112
add_dependencies(${CURRENT_LIB_NAME} tls_syntax)
1213
target_link_libraries(${CURRENT_LIB_NAME} tls_syntax)
1314
target_include_directories(${CURRENT_LIB_NAME}
1415
PUBLIC
1516
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
17+
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
1618
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
1719
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>
1820
)

lib/hpke/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ set(CURRENT_LIB_NAME hpke)
55
###
66

77
file(GLOB_RECURSE LIB_HEADERS CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
8+
file(GLOB_RECURSE LIB_GENERATED_HEADERS CONFIGURE_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/include/*.h")
89
file(GLOB_RECURSE LIB_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
9-
add_library(${CURRENT_LIB_NAME} ${LIB_HEADERS} ${LIB_SOURCES})
10+
add_library(${CURRENT_LIB_NAME} ${LIB_HEADERS} ${LIB_GENERATED_HEADERS} ${LIB_SOURCES})
1011
add_dependencies(${CURRENT_LIB_NAME} bytes tls_syntax)
1112

1213
###
@@ -66,6 +67,7 @@ target_include_directories(${CURRENT_LIB_NAME}
6667
PUBLIC
6768
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
6869
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
70+
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
6971
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>
7072
PRIVATE
7173
${OPENSSL_INCLUDE_DIR}

lib/mls_vectors/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@ set(CURRENT_LIB_NAME mls_vectors)
55
###
66

77
file(GLOB_RECURSE LIB_HEADERS CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
8+
file(GLOB_RECURSE LIB_GENERATED_HEADERS CONFIGURE_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/include/*.h")
89
file(GLOB_RECURSE LIB_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
910

10-
add_library(${CURRENT_LIB_NAME} ${LIB_HEADERS} ${LIB_SOURCES})
11+
add_library(${CURRENT_LIB_NAME} ${LIB_HEADERS} ${LIB_GENERATED_HEADERS} ${LIB_SOURCES})
1112
add_dependencies(${CURRENT_LIB_NAME} mlspp)
1213
target_link_libraries(${CURRENT_LIB_NAME} mlspp bytes tls_syntax)
1314
target_include_directories(${CURRENT_LIB_NAME}
1415
PUBLIC
1516
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
1617
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
18+
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
1719
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>
1820
)
1921

lib/tls_syntax/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@ set(CURRENT_LIB_NAME tls_syntax)
55
###
66

77
file(GLOB_RECURSE LIB_HEADERS CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
8+
file(GLOB_RECURSE LIB_GENERATED_HEADERS CONFIGURE_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/include/*.h")
89
file(GLOB_RECURSE LIB_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
910

10-
add_library(${CURRENT_LIB_NAME} ${LIB_HEADERS} ${LIB_SOURCES})
11+
add_library(${CURRENT_LIB_NAME} ${LIB_HEADERS} ${LIB_GENERATED_HEADERS} ${LIB_SOURCES})
1112
add_dependencies(${CURRENT_LIB_NAME} third_party)
1213
target_link_libraries(${CURRENT_LIB_NAME} PUBLIC third_party)
1314
target_include_directories(${CURRENT_LIB_NAME}
1415
PUBLIC
1516
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
1617
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
18+
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
1719
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>
1820
)
1921

0 commit comments

Comments
 (0)