Skip to content

Commit b03fce3

Browse files
committed
now it's properly, I wasn't careful
1 parent be178c4 commit b03fce3

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/nbl/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,19 +180,20 @@ file(GLOB_RECURSE TEMP_GLOB_RES "${NBL_ROOT_PATH}/src/*.h")
180180
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
181181

182182
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)
183+
cmake_path(GET NBL_CURRENT_HEADER PARENT_PATH NBL_CURRENT_HEADER_DIR)
184+
file(RELATIVE_PATH NBL_TMP_REL_DESTINATION "${NBL_ROOT_PATH}/src" ${NBL_CURRENT_HEADER_DIR})
186185

187-
message(STATUS ${NBL_CURRENT_HEADER})
186+
install(FILES ${NBL_CURRENT_HEADER} DESTINATION include/${NBL_TMP_REL_DESTINATION} CONFIGURATIONS Release)
187+
install(FILES ${NBL_CURRENT_HEADER} DESTINATION debug/include/${NBL_TMP_REL_DESTINATION} CONFIGURATIONS Debug)
188+
install(FILES ${NBL_CURRENT_HEADER} DESTINATION relwithdebinfo/include/${NBL_TMP_REL_DESTINATION} CONFIGURATIONS RelWithDebInfo)
188189
endforeach()
189190

190191
unset(NABLA_HEADERS_PUBLIC2 ${NBL_TMP_FULL_PATHS})
191192

192193
file(GLOB_RECURSE NABLA_HEADERS_PRIV1 "*.h")
193194
file(GLOB_RECURSE NABLA_HEADERS_PRIV2 "${NBL_ROOT_PATH}/src/nbl/*.h")
194195
# just gather all the header files and later put them into project so it's easy to search for things using IDE
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
196+
set(NABLA_HEADERS "${CMAKE_CURRENT_BINARY_DIR}/include/nabla.h" ${NABLA_HEADERS_PUBLIC} ${NABLA_HEADERS_PIRV1} ${NABLA_HEADERS_PRIV2})
196197

197198
set(NBL_CORE_SOURCES
198199
${NBL_ROOT_PATH}/src/nbl/core/IReferenceCounted.cpp

0 commit comments

Comments
 (0)