From f596666b84e7ade3f9d4c747bd6d7281884e0347 Mon Sep 17 00:00:00 2001 From: Disyer Date: Sat, 5 Aug 2023 15:46:08 +0300 Subject: [PATCH] panda: Install correct config headers for pstatclient and putil Closes #1525 --- panda/src/pstatclient/CMakeLists.txt | 2 +- panda/src/pstatclient/config_pstatclient.h | 6 +++--- panda/src/putil/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/panda/src/pstatclient/CMakeLists.txt b/panda/src/pstatclient/CMakeLists.txt index faffec2588..ed9b431070 100644 --- a/panda/src/pstatclient/CMakeLists.txt +++ b/panda/src/pstatclient/CMakeLists.txt @@ -48,4 +48,4 @@ if(NOT BUILD_METALIBS) ARCHIVE COMPONENT CoreDevel) endif() install(FILES ${P3PSTATCLIENT_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d) -install(FILES config_pstats.h COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d) +install(FILES config_pstatclient.h COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d) diff --git a/panda/src/pstatclient/config_pstatclient.h b/panda/src/pstatclient/config_pstatclient.h index f4a083afdd..a16967c964 100644 --- a/panda/src/pstatclient/config_pstatclient.h +++ b/panda/src/pstatclient/config_pstatclient.h @@ -11,8 +11,8 @@ * @date 2000-07-09 */ -#ifndef CONFIG_PSTATS_H -#define CONFIG_PSTATS_H +#ifndef CONFIG_PSTATCLIENT_H +#define CONFIG_PSTATCLIENT_H #include "pandabase.h" @@ -49,4 +49,4 @@ extern EXPCL_PANDA_PSTATCLIENT ConfigVariableBool pstats_mem_other; extern EXPCL_PANDA_PSTATCLIENT void init_libpstatclient(); -#endif +#endif /* CONFIG_PSTATCLIENT_H */ diff --git a/panda/src/putil/CMakeLists.txt b/panda/src/putil/CMakeLists.txt index eb312f845a..1332402586 100644 --- a/panda/src/putil/CMakeLists.txt +++ b/panda/src/putil/CMakeLists.txt @@ -162,4 +162,4 @@ if(NOT BUILD_METALIBS) ARCHIVE COMPONENT CoreDevel) endif() install(FILES ${P3PUTIL_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d) -install(FILES config_util.h COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d) +install(FILES config_putil.h COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)