TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

CMake: SKIP_COMPOSITING -> SKIP_UNITY_BUILD_INCLUSION

Browse Source 
The latter is what CMake (3.16+) itself uses; we should start using
CMake's own unity build capabilities if available.
This commit is contained in:
Sam Edwards 2019-12-24 17:20:43 -07:00
parent 10760d5f7a
commit cdc16291dd
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/macros/CompositeSources.cmake
View File

@ -49,7 +49,7 @@ function(composite_sources target sources_var)
get_filename_component(extension "${source}" EXT) get_filename_component(extension "${source}" EXT)
get_source_file_property(generated "${source}" GENERATED) get_source_file_property(generated "${source}" GENERATED)
get_source_file_property(is_header "${source}" HEADER_FILE_ONLY) get_source_file_property(is_header "${source}" HEADER_FILE_ONLY)
get_source_file_property(skip_compositing "${source}" SKIP_COMPOSITING) get_source_file_property(skip_compositing "${source}" SKIP_UNITY_BUILD_INCLUSION)
# Check if we can safely add this to a composite file. # Check if we can safely add this to a composite file.
if(NOT generated AND NOT is_header AND NOT skip_compositing AND if(NOT generated AND NOT is_header AND NOT skip_compositing AND

2
dtool/src/dtoolbase/CMakeLists.txt
View File

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

2
dtool/src/dtoolutil/CMakeLists.txt
View File

@ -34,7 +34,7 @@ if(APPLE)
set_source_files_properties( set_source_files_properties(
filename_assist.mm filename_assist.h PROPERTIES filename_assist.mm filename_assist.h PROPERTIES
WRAP_EXCLUDE YES WRAP_EXCLUDE YES
SKIP_COMPOSITING YES) SKIP_UNITY_BUILD_INCLUSION YES)
endif() endif()
set(P3DTOOLUTIL_SOURCES set(P3DTOOLUTIL_SOURCES

2
panda/src/display/CMakeLists.txt
View File

@ -91,7 +91,7 @@ if(APPLE)
endif() endif()
# This is a large file; let's build it separately # This is a large file; let's build it separately
set_source_files_properties(graphicsStateGuardian.cxx PROPERTIES SKIP_COMPOSITING YES) set_source_files_properties(graphicsStateGuardian.cxx PROPERTIES SKIP_UNITY_BUILD_INCLUSION YES)
composite_sources(p3display P3DISPLAY_SOURCES) composite_sources(p3display P3DISPLAY_SOURCES)
add_component_library(p3display SYMBOL BUILDING_PANDA_DISPLAY add_component_library(p3display SYMBOL BUILDING_PANDA_DISPLAY

2
panda/src/dxgsg9/CMakeLists.txt
View File

@ -36,7 +36,7 @@ set(P3DXGSG9_SOURCES
) )
# This is a large file; let's build it separately # This is a large file; let's build it separately
set_source_files_properties(dxGraphicsStateGuardian9.cxx PROPERTIES SKIP_COMPOSITING YES) set_source_files_properties(dxGraphicsStateGuardian9.cxx PROPERTIES SKIP_UNITY_BUILD_INCLUSION YES)
composite_sources(p3dxgsg9 P3DXGSG9_SOURCES) composite_sources(p3dxgsg9 P3DXGSG9_SOURCES)
add_component_library(p3dxgsg9 SYMBOL BUILDING_PANDADX add_component_library(p3dxgsg9 SYMBOL BUILDING_PANDADX

2
panda/src/grutil/CMakeLists.txt
View File

@ -39,7 +39,7 @@ set(P3GRUTIL_SOURCES
) )
# This is a large file; let's build it separately # This is a large file; let's build it separately
set_source_files_properties(multitexReducer.cxx PROPERTIES SKIP_COMPOSITING YES) set_source_files_properties(multitexReducer.cxx PROPERTIES SKIP_UNITY_BUILD_INCLUSION YES)
composite_sources(p3grutil P3GRUTIL_SOURCES) composite_sources(p3grutil P3GRUTIL_SOURCES)
add_component_library(p3grutil SYMBOL BUILDING_PANDA_GRUTIL add_component_library(p3grutil SYMBOL BUILDING_PANDA_GRUTIL

2
panda/src/pgraph/CMakeLists.txt
View File

@ -222,7 +222,7 @@ set(P3PGRAPH_IGATEEXT
) )
# This is a large file; let's build it separately # This is a large file; let's build it separately
set_source_files_properties(nodePath.cxx PROPERTIES SKIP_COMPOSITING YES) set_source_files_properties(nodePath.cxx PROPERTIES SKIP_UNITY_BUILD_INCLUSION YES)
composite_sources(p3pgraph P3PGRAPH_SOURCES) composite_sources(p3pgraph P3PGRAPH_SOURCES)
add_component_library(p3pgraph SYMBOL BUILDING_PANDA_PGRAPH add_component_library(p3pgraph SYMBOL BUILDING_PANDA_PGRAPH

2
panda/src/pnmimage/CMakeLists.txt
View File

@ -35,7 +35,7 @@ set(P3PNMIMAGE_IGATEEXT
if(HAVE_SSE2 AND CMAKE_SIZEOF_VOID_P EQUAL 4 AND CMAKE_SYSTEM_PROCESSOR MATCHES "86") if(HAVE_SSE2 AND CMAKE_SIZEOF_VOID_P EQUAL 4 AND CMAKE_SYSTEM_PROCESSOR MATCHES "86")
# It's only necessary to do this on 32-bit x86; 64-bit makes SSE2 builtin. # It's only necessary to do this on 32-bit x86; 64-bit makes SSE2 builtin.
set_source_files_properties(convert_srgb_sse2.cxx PROPERTIES set_source_files_properties(convert_srgb_sse2.cxx PROPERTIES
SKIP_COMPOSITING YES SKIP_UNITY_BUILD_INCLUSION YES
COMPILE_FLAGS -msse2) COMPILE_FLAGS -msse2)
endif() endif()