Explorar el Código

CMake: Build PythonThread as an IGATEEXT

This frees up a dependency from p3pipeline proper against Python
Sam Edwards hace 8 años
padre
commit
1e30cf6c16
Se han modificado 1 ficheros con 4 adiciones y 10 borrados
  1. 4 10
      panda/src/pipeline/CMakeLists.txt

+ 4 - 10
panda/src/pipeline/CMakeLists.txt

@@ -124,21 +124,15 @@ if(WIN32)
   )
   )
 endif()
 endif()
 
 
-if(HAVE_PYTHON)
-  set(P3PIPELINE_HEADERS
-    ${P3PIPELINE_HEADERS}
-    pythonThread.h
-  )
-  set(P3PIPELINE_SOURCES
-    ${P3PIPELINE_SOURCES}
+set(P3PIPELINE_IGATEEXT
     pythonThread.cxx
     pythonThread.cxx
-  )
-endif()
+    pythonThread.h
+)
 
 
 composite_sources(p3pipeline P3PIPELINE_SOURCES)
 composite_sources(p3pipeline P3PIPELINE_SOURCES)
 add_library(p3pipeline ${P3PIPELINE_HEADERS} ${P3PIPELINE_SOURCES})
 add_library(p3pipeline ${P3PIPELINE_HEADERS} ${P3PIPELINE_SOURCES})
 target_link_libraries(p3pipeline p3express)
 target_link_libraries(p3pipeline p3express)
-target_interrogate(p3pipeline ALL)
+target_interrogate(p3pipeline ALL EXTENSIONS ${P3PIPELINE_IGATEEXT})
 
 
 install(TARGETS p3pipeline DESTINATION lib)
 install(TARGETS p3pipeline DESTINATION lib)
 install(FILES ${P3PIPELINE_HEADERS} DESTINATION include/panda3d)
 install(FILES ${P3PIPELINE_HEADERS} DESTINATION include/panda3d)