CMake: Update for upstream changes

panda/CMakeLists.txt

@@ -38,7 +38,6 @@ add_subdirectory(src/mathutil)
 add_subdirectory(src/movies)
 add_subdirectory(src/nativenet)
 add_subdirectory(src/net)
-add_subdirectory(src/osxdisplay)
 add_subdirectory(src/pandabase)
 add_subdirectory(src/parametrics)
 add_subdirectory(src/pgraph)

panda/src/express/CMakeLists.txt

@@ -36,7 +36,6 @@ set(P3EXPRESS_HEADERS
   pointerToArrayBase.I pointerToArrayBase.h
   pointerToBase.I pointerToBase.h
   pointerToVoid.I pointerToVoid.h
-  profileTimer.I profileTimer.h
   pta_int.h
   pta_uchar.h pta_double.h pta_float.h
   pta_stdfloat.h
@@ -94,7 +93,6 @@ set(P3EXPRESS_SOURCES
   pointerToArray.cxx
   pointerToBase.cxx
   pointerToVoid.cxx
-  profileTimer.cxx
   pta_int.cxx
   pta_uchar.cxx pta_double.cxx pta_float.cxx
   ramfile.cxx

panda/src/osxdisplay/CMakeLists.txt

@@ -1,35 +0,0 @@
-if(NOT APPLE OR NOT HAVE_GL OR NOT HAVE_CARBON)
-  return()
-endif()
-
-set(P3OSXDISPLAY_HEADERS
-    config_osxdisplay.h
-    osxGraphicsBuffer.h
-    osxGraphicsPipe.h
-    osxGraphicsWindow.h osxGraphicsWindow.I
-    osxGraphicsStateGuardian.h)
-
-set(P3OSXDISPLAY_SOURCES
-    config_osxdisplay.cxx
-    osxGraphicsPipe.cxx osxGraphicsStateGuardian.cxx
-    osxGraphicsBuffer.cxx)
-
-composite_sources(p3osxdisplay P3OSXDISPLAY_SOURCES)
-add_component_library(p3osxdisplay SYMBOL BUILDING_PANDA_OSXDISPLAY
-  ${P3OSXDISPLAY_HEADERS} ${P3OSXDISPLAY_SOURCES})
-set_target_properties(p3osxdisplay PROPERTIES COMPILE_FLAGS "-ObjC++")
-target_link_libraries(p3osxdisplay p3glgsg panda)
-
-# Frameworks:
-find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
-find_library(CARBON_LIBRARY Carbon)
-find_library(AGL_LIBRARY AGL)
-find_library(CORESERVICES_LIBRARY CoreServices)
-find_library(COCOA_LIBRARY Cocoa)
-target_link_libraries(p3osxdisplay
-  ${APPLICATIONSERVICES_LIBRARY} ${CARBON_LIBRARY} ${AGL_LIBRARY}
-  ${CORESERVICES_LIBRARY} ${COCOA_LIBRARY})
-
-if(NOT BUILD_METALIBS)
-  install(TARGETS p3osxdisplay EXPORT Core COMPONENT Core DESTINATION lib)
-endif()

panda/src/pipeline/CMakeLists.txt

@@ -5,9 +5,7 @@ set(P3PIPELINE_HEADERS
   conditionVarDebug.h conditionVarDebug.I
   conditionVarDirect.h conditionVarDirect.I
   conditionVarDummyImpl.h conditionVarDummyImpl.I
-  conditionVarFull.h conditionVarFull.I
-  conditionVarFullDebug.h conditionVarFullDebug.I
-  conditionVarFullDirect.h conditionVarFullDirect.I
+  conditionVarFull.h
   conditionVarImpl.h
   conditionVarSimpleImpl.h conditionVarSimpleImpl.I
   conditionVarSpinlockImpl.h conditionVarSpinlockImpl.I
@@ -61,9 +59,6 @@ set(P3PIPELINE_SOURCES
   conditionVarDebug.cxx
   conditionVarDirect.cxx
   conditionVarDummyImpl.cxx
-  conditionVarFull.cxx
-  conditionVarFullDebug.cxx
-  conditionVarFullDirect.cxx
   conditionVarSimpleImpl.cxx
   conditionVarSpinlockImpl.cxx
   conditionVarPosixImpl.cxx
@@ -110,12 +105,10 @@ set(P3PIPELINE_SOURCES
 if(WIN32)
   set(P3PIPELINE_HEADERS
     ${P3PIPELINE_HEADERS}
-    conditionVarFullWin32Impl.h conditionVarFullWin32Impl.I
     conditionVarWin32Impl.h conditionVarWin32Impl.I
     threadWin32Impl.h threadWin32Impl.I)
   set(P3PIPELINE_SOURCES
     ${P3PIPELINE_SOURCES}
-    conditionVarFullWin32Impl.cxx
     conditionVarWin32Impl.cxx
     threadWin32Impl.cxx)
 endif()

pandatool/CMakeLists.txt

@@ -6,7 +6,6 @@ endif()
 add_subdirectory(src/assimp)
 add_subdirectory(src/bam)
 add_subdirectory(src/converter)
-add_subdirectory(src/cvscopy)
 add_subdirectory(src/dxf)
 add_subdirectory(src/dxfegg)
 add_subdirectory(src/dxfprogs)

pandatool/src/cvscopy/CMakeLists.txt

@@ -1,14 +0,0 @@
-set(P3CVSCOPY_HEADERS
-  cvsCopy.h cvsSourceDirectory.h cvsSourceTree.h
-)
-
-set(P3CVSCOPY_SOURCES
-  cvsCopy.cxx cvsSourceDirectory.cxx cvsSourceTree.cxx
-)
-
-composite_sources(p3cvscopy P3CVSCOPY_SOURCES)
-add_library(p3cvscopy STATIC ${P3CVSCOPY_HEADERS} ${P3CVSCOPY_SOURCES})
-target_link_libraries(p3cvscopy p3progbase)
-
-# This is only needed for binaries in the pandatool package. It is not useful
-# for user applications, so it is not installed.

pandatool/src/fltprogs/CMakeLists.txt

@@ -6,10 +6,6 @@ add_executable(flt-trans fltTrans.cxx fltTrans.h)
 target_link_libraries(flt-trans p3progbase p3flt)
 install(TARGETS flt-trans EXPORT Tools COMPONENT Tools DESTINATION bin)
 
-add_executable(fltcopy fltCopy.cxx fltCopy.h)
-target_link_libraries(fltcopy p3progbase p3cvscopy p3flt)
-install(TARGETS fltcopy EXPORT Tools COMPONENT Tools DESTINATION bin)
-
 if(HAVE_EGG)
 
   add_executable(egg2flt eggToFlt.cxx eggToFlt.h)