Skip to content

Commit 6acf0f7

Browse files
committedOct 22, 2016
msvc: use /bigobj for sip modules
(cherry picked from commit d0b3e39)
1 parent 2cb6982 commit 6acf0f7

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed
 

‎cmake/SIPMacros.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP CPP_FILES)
9292
ENDIF(MSVC)
9393
ENDIF(PEDANTIC)
9494

95+
IF(MSVC)
96+
ADD_DEFINITIONS( /bigobj )
97+
ENDIF(MSVC)
98+
9599
SET(SIPCMD ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip})
96100
SET(SUPPRESS_SIP_WARNINGS FALSE CACHE BOOL "Hide SIP warnings")
97101
MARK_AS_ADVANCED(SUPPRESS_SIP_WARNINGS)

‎ms-windows/osgeo4w/package.cmd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,6 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-server/%PACKAGENAME
342342
"apps/%PACKAGENAME%/bin/wms_metadata.xml" ^
343343
"apps/%PACKAGENAME%/bin/schemaExtension.xsd" ^
344344
"apps/%PACKAGENAME%/python/qgis/_server.pyd" ^
345-
"apps/%PACKAGENAME%/python/qgis/_server.lib" ^
346345
"apps/%PACKAGENAME%/python/qgis/server/" ^
347346
"httpd.d/httpd_%PACKAGENAME%.conf.tmpl" ^
348347
"etc/postinstall/%PACKAGENAME%-server.bat" ^

0 commit comments

Comments
 (0)
Please sign in to comment.