Quellcode durchsuchen

CMake: Clean up p3express's strange dependencies on dtool

Sam Edwards vor 7 Jahren
Ursprung
Commit
27ac068908
1 geänderte Dateien mit 0 neuen und 15 gelöschten Zeilen
  1. 0 15
      panda/src/express/CMakeLists.txt

+ 0 - 15
panda/src/express/CMakeLists.txt

@@ -118,25 +118,13 @@ set(P3EXPRESS_SOURCES
   windowsRegistry.cxx
   windowsRegistry.cxx
   zStream.cxx zStreamBuf.cxx)
   zStream.cxx zStreamBuf.cxx)
 
 
-# Some of these reside in dtoolbase/dtoolutil. But dtool isn't run through
-# Interrogate; Panda is. So we're responsible for providing the extensions.
 set(P3EXPRESS_IGATEEXT
 set(P3EXPRESS_IGATEEXT
   datagram_ext.h
   datagram_ext.h
-  ../../../dtool/src/dtoolutil/filename_ext.cxx
-  ../../../dtool/src/dtoolutil/filename_ext.h
-  ../../../dtool/src/dtoolutil/globPattern_ext.cxx
-  ../../../dtool/src/dtoolutil/globPattern_ext.h
   memoryUsagePointers_ext.cxx
   memoryUsagePointers_ext.cxx
   memoryUsagePointers_ext.h
   memoryUsagePointers_ext.h
   pointerToArray_ext.h
   pointerToArray_ext.h
   ramfile_ext.cxx
   ramfile_ext.cxx
   ramfile_ext.h
   ramfile_ext.h
-  ../../../dtool/src/prc/streamReader_ext.cxx
-  ../../../dtool/src/prc/streamReader_ext.h
-  ../../../dtool/src/prc/streamWriter_ext.cxx
-  ../../../dtool/src/prc/streamWriter_ext.h
-  ../../../dtool/src/dtoolbase/typeHandle_ext.cxx
-  ../../../dtool/src/dtoolbase/typeHandle_ext.h
   virtualFileSystem_ext.cxx
   virtualFileSystem_ext.cxx
   virtualFileSystem_ext.h
   virtualFileSystem_ext.h
   virtualFile_ext.cxx
   virtualFile_ext.cxx
@@ -147,9 +135,6 @@ composite_sources(p3express P3EXPRESS_SOURCES)
 add_component_library(p3express SYMBOL BUILDING_PANDA_EXPRESS
 add_component_library(p3express SYMBOL BUILDING_PANDA_EXPRESS
   ${P3EXPRESS_SOURCES} ${P3EXPRESS_HEADERS})
   ${P3EXPRESS_SOURCES} ${P3EXPRESS_HEADERS})
 
 
-# p3express needs to include from p3interrogatedb for py_panda.h and extension.h
-target_include_directories(p3express PUBLIC
-  $<TARGET_PROPERTY:p3interrogatedb,INTERFACE_INCLUDE_DIRECTORIES>)
 target_link_libraries(p3express p3pandabase p3dtoolconfig p3dtool)
 target_link_libraries(p3express p3pandabase p3dtoolconfig p3dtool)
 target_use_packages(p3express TAR ZLIB)
 target_use_packages(p3express TAR ZLIB)
 target_interrogate(p3express ALL EXTENSIONS ${P3EXPRESS_IGATEEXT})
 target_interrogate(p3express ALL EXTENSIONS ${P3EXPRESS_IGATEEXT})