Skip to content

Commit 15bd969

Browse files
committed
Install interrogatedb headers with interrogatedb prefix, don't install interrogate headers
1 parent b8966a6 commit 15bd969

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/interrogate/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,5 +124,5 @@ if(SKBUILD)
124124
install(TARGETS interrogate_module COMPONENT tools DESTINATION interrogate_module)
125125
else()
126126
install(TARGETS interrogate interrogate_module COMPONENT tools DESTINATION ${CMAKE_INSTALL_BINDIR})
127-
install(FILES ${INTERROGATE_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
127+
#install(FILES ${INTERROGATE_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interrogate)
128128
endif()

src/interrogatedb/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ target_link_libraries(interrogatedb dtoolutil)
4242
install(TARGETS interrogatedb
4343
DESTINATION ${CMAKE_INSTALL_LIBDIR}
4444
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
45-
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
46-
install(FILES ${INTERROGATEDB_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
47-
install(FILES ${IGATERUNTIME_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
45+
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interrogatedb)
46+
install(FILES ${INTERROGATEDB_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interrogatedb)
47+
install(FILES ${IGATERUNTIME_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interrogatedb)
4848

4949
# ALSO: This has an Interrogate binding! Take care of that if we want it.
5050
# Note we don't use the regular Interrogate macros; this has some custom flags

0 commit comments

Comments
 (0)