Browse Source

CMake: Update for upstream changes

Sam Edwards 7 years ago
parent
commit
62e335a801
2 changed files with 6 additions and 4 deletions
  1. 3 2
      panda/src/pstatclient/CMakeLists.txt
  2. 3 2
      panda/src/putil/CMakeLists.txt

+ 3 - 2
panda/src/pstatclient/CMakeLists.txt

@@ -1,5 +1,5 @@
 set(P3PSTATCLIENT_HEADERS
 set(P3PSTATCLIENT_HEADERS
-    config_pstats.h pStatClient.I pStatClient.h
+    config_pstatclient.h pStatClient.I pStatClient.h
     pStatClientImpl.I pStatClientImpl.h
     pStatClientImpl.I pStatClientImpl.h
     pStatClientVersion.I
     pStatClientVersion.I
     pStatClientVersion.h pStatClientControlMessage.h
     pStatClientVersion.h pStatClientControlMessage.h
@@ -10,7 +10,7 @@ set(P3PSTATCLIENT_HEADERS
     pStatTimer.I pStatTimer.h)
     pStatTimer.I pStatTimer.h)
 
 
 set(P3PSTATCLIENT_SOURCES
 set(P3PSTATCLIENT_SOURCES
-    config_pstats.cxx pStatClient.cxx pStatClientImpl.cxx
+    config_pstatclient.cxx pStatClient.cxx pStatClientImpl.cxx
     pStatClientVersion.cxx
     pStatClientVersion.cxx
     pStatClientControlMessage.cxx
     pStatClientControlMessage.cxx
     pStatCollector.cxx
     pStatCollector.cxx
@@ -28,3 +28,4 @@ target_interrogate(p3pstatclient ALL)
 
 
 install(TARGETS p3pstatclient DESTINATION lib)
 install(TARGETS p3pstatclient DESTINATION lib)
 install(FILES ${P3PSTATCLIENT_HEADERS} DESTINATION include/panda3d)
 install(FILES ${P3PSTATCLIENT_HEADERS} DESTINATION include/panda3d)
+install(FILES config_pstats.h DESTINATION include/panda3d)

+ 3 - 2
panda/src/putil/CMakeLists.txt

@@ -23,7 +23,7 @@ set(P3PUTIL_HEADERS
   copyOnWriteObject.h copyOnWriteObject.I
   copyOnWriteObject.h copyOnWriteObject.I
   copyOnWritePointer.h copyOnWritePointer.I
   copyOnWritePointer.h copyOnWritePointer.I
   compareTo.I compareTo.h
   compareTo.I compareTo.h
-  config_util.N config_util.h configurable.h
+  config_putil.N config_putil.h configurable.h
   cPointerCallbackObject.h cPointerCallbackObject.I
   cPointerCallbackObject.h cPointerCallbackObject.I
   datagramBuffer.I datagramBuffer.h
   datagramBuffer.I datagramBuffer.h
   datagramInputFile.I datagramInputFile.h
   datagramInputFile.I datagramInputFile.h
@@ -83,7 +83,7 @@ set(P3PUTIL_SOURCES
   colorSpace.cxx
   colorSpace.cxx
   copyOnWriteObject.cxx
   copyOnWriteObject.cxx
   copyOnWritePointer.cxx
   copyOnWritePointer.cxx
-  config_util.cxx configurable.cxx
+  config_putil.cxx configurable.cxx
   cPointerCallbackObject.cxx
   cPointerCallbackObject.cxx
   datagramBuffer.cxx
   datagramBuffer.cxx
   datagramInputFile.cxx datagramOutputFile.cxx
   datagramInputFile.cxx datagramOutputFile.cxx
@@ -131,6 +131,7 @@ target_interrogate(p3putil ALL EXTENSIONS ${P3PUTIL_IGATEEXT})
 
 
 install(TARGETS p3putil DESTINATION lib)
 install(TARGETS p3putil DESTINATION lib)
 install(FILES ${P3PUTIL_HEADERS} DESTINATION include/panda3d)
 install(FILES ${P3PUTIL_HEADERS} DESTINATION include/panda3d)
+install(FILES config_util.h DESTINATION include/panda3d)
 
 
 #begin test_bin_target
 #begin test_bin_target
   #define TARGET test_bamRead
   #define TARGET test_bamRead