From 50f89f5fd5213a557251c4fbe5a5ed87ffbd0aaa Mon Sep 17 00:00:00 2001
From: Sam Edwards <CFSworks@gmail.com>
Date: Sat, 25 Jun 2016 19:10:18 -0700
Subject: [PATCH] cmake: Adjust for upstream changes.

---
 panda/CMakeLists.txt                   | 2 +-
 panda/src/downloader/CMakeLists.txt    | 2 +-
 panda/src/movies/CMakeLists.txt        | 4 ++++
 panda/src/nativenet/CMakeLists.txt     | 3 ++-
 panda/src/ode/CMakeLists.txt           | 2 +-
 panda/src/pgraphnodes/CMakeLists.txt   | 2 ++
 panda/src/pnmimagetypes/CMakeLists.txt | 4 ++++
 7 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/panda/CMakeLists.txt b/panda/CMakeLists.txt
index 786260f343..26531e4661 100644
--- a/panda/CMakeLists.txt
+++ b/panda/CMakeLists.txt
@@ -22,9 +22,9 @@ endif()
 add_subdirectory(src/configfiles)
 add_subdirectory(src/pandabase)
 add_subdirectory(src/express)
+add_subdirectory(src/pipeline)
 add_subdirectory(src/downloader)
 add_subdirectory(src/downloadertools)
-add_subdirectory(src/pipeline)
 add_subdirectory(src/nativenet)
 add_subdirectory(src/net)
 add_subdirectory(src/linmath)
diff --git a/panda/src/downloader/CMakeLists.txt b/panda/src/downloader/CMakeLists.txt
index f82ed55333..34f0037cd3 100644
--- a/panda/src/downloader/CMakeLists.txt
+++ b/panda/src/downloader/CMakeLists.txt
@@ -69,7 +69,7 @@ set(P3DOWNLOADER_IGATEEXT
 
 composite_sources(p3downloader P3DOWNLOADER_SOURCES)
 add_library(p3downloader ${P3DOWNLOADER_HEADERS} ${P3DOWNLOADER_SOURCES})
-target_link_libraries(p3downloader p3express)
+target_link_libraries(p3downloader p3express p3pipeline)
 target_interrogate(p3downloader ALL EXTENSIONS ${P3DOWNLOADER_IGATEEXT})
 
 install(TARGETS p3downloader DESTINATION lib)
diff --git a/panda/src/movies/CMakeLists.txt b/panda/src/movies/CMakeLists.txt
index 3f31767fa0..24f0ccebf2 100644
--- a/panda/src/movies/CMakeLists.txt
+++ b/panda/src/movies/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(P3MOVIES_HEADERS
     config_movies.h
+    flacAudio.h flacAudio.I
+    flacAudioCursor.h flacAudioCursor.I
     inkblotVideo.h inkblotVideo.I
     inkblotVideoCursor.h inkblotVideoCursor.I
     microphoneAudio.h microphoneAudio.I
@@ -17,6 +19,8 @@ set(P3MOVIES_HEADERS
 
 set(P3MOVIES_SOURCES
     config_movies.cxx
+    flacAudio.cxx
+    flacAudioCursor.cxx
     inkblotVideo.cxx
     inkblotVideoCursor.cxx
     microphoneAudio.cxx
diff --git a/panda/src/nativenet/CMakeLists.txt b/panda/src/nativenet/CMakeLists.txt
index 78da36d243..128d2aaff9 100644
--- a/panda/src/nativenet/CMakeLists.txt
+++ b/panda/src/nativenet/CMakeLists.txt
@@ -15,6 +15,7 @@ if(WANT_NATIVE_NET)
   set(P3NATIVENET_SOURCES
       config_nativenet.cxx
       buffered_datagramconnection.cxx
+      socket_address.cxx
       socket_ip.cxx
       socket_tcp.cxx
       socket_tcp_listen.cxx
@@ -25,7 +26,7 @@ if(WANT_NATIVE_NET)
 
   composite_sources(p3nativenet P3NATIVENET_SOURCES)
   add_library(p3nativenet ${P3NATIVENET_HEADERS} ${P3NATIVENET_SOURCES})
-  target_link_libraries(p3nativenet p3express p3pandabase)
+  target_link_libraries(p3nativenet p3express p3pandabase p3downloader)
   target_interrogate(p3nativenet ALL)
 
   install(TARGETS p3nativenet DESTINATION lib)
diff --git a/panda/src/ode/CMakeLists.txt b/panda/src/ode/CMakeLists.txt
index 95791acc5c..25795f4fc0 100755
--- a/panda/src/ode/CMakeLists.txt
+++ b/panda/src/ode/CMakeLists.txt
@@ -82,7 +82,7 @@ if(HAVE_ODE)
 
   composite_sources(p3ode P3ODE_SOURCES)
   add_library(p3ode ${P3ODE_SOURCES} ${P3ODE_HEADERS})
-  #set_target_properties(p3ode PROPERTIES COMPILE_DEFINITIONS dSINGLE)
+  set_target_properties(p3ode PROPERTIES COMPILE_DEFINITIONS dSINGLE)
   target_link_libraries(p3ode p3pgraph p3physics ${ODE_LIBRARY})
   target_interrogate(p3ode ${P3ODE_IGATE_SOURCES} EXTENSIONS ${P3ODE_IGATEEXT})
 
diff --git a/panda/src/pgraphnodes/CMakeLists.txt b/panda/src/pgraphnodes/CMakeLists.txt
index 5458489c31..8e09ca530c 100644
--- a/panda/src/pgraphnodes/CMakeLists.txt
+++ b/panda/src/pgraphnodes/CMakeLists.txt
@@ -14,6 +14,7 @@ set(P3PGRAPHNODES_HEADERS
     selectiveChildNode.h selectiveChildNode.I
     sequenceNode.h sequenceNode.I
     shaderGenerator.h shaderGenerator.I
+    sphereLight.h sphereLight.I
     spotlight.h spotlight.I
     switchNode.h switchNode.I
     uvScrollNode.I uvScrollNode.h
@@ -35,6 +36,7 @@ set(P3PGRAPHNODES_SOURCES
     selectiveChildNode.cxx
     sequenceNode.cxx
     shaderGenerator.cxx
+    sphereLight.cxx
     spotlight.cxx
     switchNode.cxx
     uvScrollNode.cxx
diff --git a/panda/src/pnmimagetypes/CMakeLists.txt b/panda/src/pnmimagetypes/CMakeLists.txt
index 680b767ecb..5466a5a826 100644
--- a/panda/src/pnmimagetypes/CMakeLists.txt
+++ b/panda/src/pnmimagetypes/CMakeLists.txt
@@ -1,10 +1,12 @@
 set(P3PNMIMAGETYPES_HEADERS
   config_pnmimagetypes.h pnmFileTypeBMP.h
+  pnmFileTypeEXR.h
   pnmFileTypeIMG.h
   pnmFileTypePNG.h
   pnmFileTypePNM.h
   pnmFileTypePfm.h
   pnmFileTypeSGI.h pnmFileTypeSoftImage.h
+  pnmFileTypeStbImage.h
   pnmFileTypeTGA.h
   pnmFileTypeTIFF.h
   pnmFileTypeJPG.h
@@ -14,6 +16,7 @@ set(P3PNMIMAGETYPES_SOURCES
   config_pnmimagetypes.cxx
   pnmFileTypeBMPReader.cxx pnmFileTypeBMPWriter.cxx
   pnmFileTypeBMP.cxx
+  pnmFileTypeEXR.cxx
   pnmFileTypeIMG.cxx
   pnmFileTypeJPG.cxx pnmFileTypeJPGReader.cxx pnmFileTypeJPGWriter.cxx
   pnmFileTypePNG.cxx
@@ -22,6 +25,7 @@ set(P3PNMIMAGETYPES_SOURCES
   pnmFileTypeSGI.cxx
   pnmFileTypeSGIReader.cxx pnmFileTypeSGIWriter.cxx
   pnmFileTypeSoftImage.cxx
+  pnmFileTypeStbImage.cxx
   pnmFileTypeTIFF.cxx
   pnmFileTypeTGA.cxx
 )