Skip to content

Commit be178c4

Browse files
committed
Add missing headers to install target
1 parent 48d316b commit be178c4

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

src/nbl/CMakeLists.txt

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,23 @@ file(GLOB_RECURSE TEMP_GLOB_RES "${NBL_ROOT_PATH}/include/*.h")
176176
set(NABLA_HEADERS_PUBLIC ${NABLA_HEADERS_PUBLIC} ${TEMP_GLOB_RES})
177177
file(GLOB_RECURSE TEMP_GLOB_RES "${NBL_ROOT_PATH}/include/*.tcc")
178178
set(NABLA_HEADERS_PUBLIC ${NABLA_HEADERS_PUBLIC} ${TEMP_GLOB_RES})
179+
file(GLOB_RECURSE TEMP_GLOB_RES "${NBL_ROOT_PATH}/src/*.h")
180+
set(NABLA_HEADERS_PUBLIC2 ${NABLA_HEADERS_PUBLIC2} ${TEMP_GLOB_RES}) # TODO: we should have moved all headers from src directory to /include, but we need it for install target
181+
182+
foreach(NBL_CURRENT_HEADER IN LISTS NABLA_HEADERS_PUBLIC2)
183+
install(FILES ${NBL_CURRENT_HEADER} DESTINATION include CONFIGURATIONS Release)
184+
install(FILES ${NBL_CURRENT_HEADER} DESTINATION debug/include CONFIGURATIONS Debug)
185+
install(FILES ${NBL_CURRENT_HEADER} DESTINATION relwithdebinfo/include CONFIGURATIONS RelWithDebInfo)
186+
187+
message(STATUS ${NBL_CURRENT_HEADER})
188+
endforeach()
189+
190+
unset(NABLA_HEADERS_PUBLIC2 ${NBL_TMP_FULL_PATHS})
179191

180192
file(GLOB_RECURSE NABLA_HEADERS_PRIV1 "*.h")
181193
file(GLOB_RECURSE NABLA_HEADERS_PRIV2 "${NBL_ROOT_PATH}/src/nbl/*.h")
182194
# just gather all the header files and later put them into project so it's easy to search for things using IDE
183-
set(NABLA_HEADERS "${CMAKE_CURRENT_BINARY_DIR}/include/nabla.h" ${NABLA_HEADERS_PUBLIC} ${NABLA_HEADERS_PIRV1} ${NABLA_HEADERS_PRIV2})
195+
set(NABLA_HEADERS "${CMAKE_CURRENT_BINARY_DIR}/include/nabla.h" ${NABLA_HEADERS_PUBLIC} ${NABLA_HEADERS_PIRV1} ${NABLA_HEADERS_PRIV2}) # see, we don't want NABLA_HEADERS_PUBLIC2 here
184196

185197
set(NBL_CORE_SOURCES
186198
${NBL_ROOT_PATH}/src/nbl/core/IReferenceCounted.cpp
@@ -656,7 +668,6 @@ start_tracking_variables_for_propagation_to_parent()
656668
add_subdirectory(ext)
657669
propagate_changed_variables_to_parent_scope()
658670

659-
660671
set(NABLA_HEADERS_TO_INSTALL
661672
${NABLA_HEADERS_PUBLIC}
662673
)

0 commit comments

Comments
 (0)