Browse Source

CMake: Use the SKIP_COMPOSITING flag on some files

Files excluded from compositing are (from makepanda):
dtool/src/dtoolbase/indent.cxx
panda/src/display/graphicsStateGuardian.cxx
panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx
panda/src/grutil/multitexReducer.cxx
panda/src/pgraph/nodePath.cxx
panda/src/pnmimage/convert_srgb_sse2.cxx (due to being compiled w/ SSE2)
Sam Edwards 7 years ago
parent
commit
a0e12f4211

+ 2 - 0
dtool/src/dtoolbase/CMakeLists.txt

@@ -83,6 +83,8 @@ set(P3DTOOLBASE_IGATEEXT
     typeHandle_ext.h
 )
 
+set_source_files_properties(indent.cxx PROPERTIES SKIP_COMPOSITING YES)
+
 composite_sources(p3dtoolbase P3DTOOLBASE_SOURCES)
 
 add_component_library(p3dtoolbase NOINIT SYMBOL BUILDING_DTOOL_DTOOLBASE

+ 4 - 1
dtool/src/dtoolutil/CMakeLists.txt

@@ -30,7 +30,10 @@ set(P3DTOOLUTIL_HEADERS
 if(APPLE)
   set(P3DTOOLUTIL_HEADERS ${P3DTOOLUTIL_HEADERS}
     filename_assist.mm filename_assist.h)
-  set_source_files_properties(filename_assist.mm filename_assist.h PROPERTIES WRAP_EXCLUDE YES)
+  set_source_files_properties(
+    filename_assist.mm filename_assist.h PROPERTIES
+    WRAP_EXCLUDE YES
+    SKIP_COMPOSITING YES)
 endif()
 
 set(P3DTOOLUTIL_SOURCES

+ 3 - 0
panda/src/display/CMakeLists.txt

@@ -90,6 +90,9 @@ if(APPLE)
   )
 endif()
 
+# This is a large file; let's build it separately
+set_source_files_properties(graphicsStateGuardian.cxx PROPERTIES SKIP_COMPOSITING YES)
+
 composite_sources(p3display P3DISPLAY_SOURCES)
 add_component_library(p3display SYMBOL BUILDING_PANDA_DISPLAY
   ${P3DISPLAY_HEADERS} ${P3DISPLAY_SOURCES})

+ 3 - 0
panda/src/dxgsg9/CMakeLists.txt

@@ -35,6 +35,9 @@ set(P3DXGSG9_SOURCES
   wdxGraphicsWindow9.cxx
 )
 
+# This is a large file; let's build it separately
+set_source_files_properties(dxGraphicsStateGuardian9.cxx PROPERTIES SKIP_COMPOSITING YES)
+
 composite_sources(p3dxgsg9 P3DXGSG9_SOURCES)
 add_component_library(p3dxgsg9 SYMBOL BUILDING_PANDADX
   ${P3DXGSG9_HEADERS} ${P3DXGSG9_SOURCES})

+ 3 - 0
panda/src/grutil/CMakeLists.txt

@@ -37,6 +37,9 @@ set(P3GRUTIL_SOURCES
   rigidBodyCombiner.cxx
 )
 
+# This is a large file; let's build it separately
+set_source_files_properties(multitexReducer.cxx PROPERTIES SKIP_COMPOSITING YES)
+
 composite_sources(p3grutil P3GRUTIL_SOURCES)
 add_component_library(p3grutil SYMBOL BUILDING_PANDA_GRUTIL
   ${P3GRUTIL_HEADERS} ${P3GRUTIL_SOURCES})

+ 3 - 0
panda/src/pgraph/CMakeLists.txt

@@ -217,6 +217,9 @@ set(P3PGRAPH_IGATEEXT
   transformState_ext.h
 )
 
+# This is a large file; let's build it separately
+set_source_files_properties(nodePath.cxx PROPERTIES SKIP_COMPOSITING YES)
+
 composite_sources(p3pgraph P3PGRAPH_SOURCES)
 add_component_library(p3pgraph SYMBOL BUILDING_PANDA_PGRAPH
   ${P3PGRAPH_HEADERS} ${P3PGRAPH_SOURCES})

+ 5 - 2
panda/src/pnmimage/CMakeLists.txt

@@ -15,6 +15,7 @@ set(P3PNMIMAGE_HEADERS
 set(P3PNMIMAGE_SOURCES
   config_pnmimage.cxx
   convert_srgb.cxx
+  convert_srgb_sse2.cxx
   pfmFile.cxx
   pnm-image-filter.cxx
   pnmbitio.cxx
@@ -32,12 +33,14 @@ set(P3PNMIMAGE_IGATEEXT
 )
 
 if(HAVE_SSE2)
-  set_source_files_properties(convert_srgb_sse2.cxx PROPERTIES COMPILE_FLAGS -msse2)
+  set_source_files_properties(convert_srgb_sse2.cxx PROPERTIES
+    SKIP_COMPOSITING YES
+    COMPILE_FLAGS -msse2)
 endif()
 
 composite_sources(p3pnmimage P3PNMIMAGE_SOURCES)
 add_component_library(p3pnmimage SYMBOL BUILDING_PANDA_PNMIMAGE
-  ${P3PNMIMAGE_HEADERS} ${P3PNMIMAGE_SOURCES} convert_srgb_sse2.cxx)
+  ${P3PNMIMAGE_HEADERS} ${P3PNMIMAGE_SOURCES})
 target_link_libraries(p3pnmimage p3mathutil)
 target_interrogate(p3pnmimage ALL EXTENSIONS ${P3PNMIMAGE_IGATEEXT})