Skip to content

Commit 9ce33c9

Browse files
authored
Merge pull request qgis#59289 from nicogodet/fix-bigobj
Add /bigobj compile flag for some files
2 parents f0a7b63 + 78c3d92 commit 9ce33c9

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

src/app/CMakeLists.txt

+12-7
Original file line numberDiff line numberDiff line change
@@ -477,16 +477,21 @@ if(PEDANTIC)
477477
endif()
478478

479479
if(MSVC)
480-
# -wd4091 Avoid 'typedef' ignored on left of '' when no variable is declared warning in dbghelp.h
481-
set_source_files_properties(
482-
qgisapp.cpp
483-
main.cpp
484-
qgscrashhandler.cpp
485-
PROPERTIES COMPILE_FLAGS -wd4091)
480+
# -wd4091 Avoid 'typedef' ignored on left of '' when no variable is declared warning in dbghelp.h
481+
set_source_files_properties(
482+
qgisapp.cpp
483+
main.cpp
484+
qgscrashhandler.cpp
485+
PROPERTIES COMPILE_FLAGS -wd4091
486+
)
487+
set_source_files_properties(
488+
qgisapp.cpp
489+
PROPERTIES COMPILE_FLAGS "/bigobj"
490+
)
486491
endif()
487492

488493
if(HAVE_OPENCL)
489-
include_directories(SYSTEM ${OpenCL_INCLUDE_DIRS})
494+
include_directories(SYSTEM ${OpenCL_INCLUDE_DIRS})
490495
endif()
491496

492497
if(ENABLE_MODELTEST)

src/core/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -2184,7 +2184,9 @@ if(MSVC)
21842184
set_source_files_properties(
21852185
${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp
21862186
${CMAKE_CURRENT_BINARY_DIR}/qgis_core_autogen/mocs_compilation.cpp
2187+
expression/qgsexpressionfunction.cpp
21872188
proj/qgscoordinatereferencesystem.cpp
2189+
textrenderer/qgsfontmanager.cpp
21882190
PROPERTIES COMPILE_FLAGS "/bigobj"
21892191
)
21902192
else()

0 commit comments

Comments
 (0)