sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

msvc: use /bigobj for sip modules

Browse Source 
(cherry picked from commit d0b3e39cdab1da17d7a977ba3def5ce1b64ff707)
This commit is contained in:
Juergen E. Fischer 2016-07-10 22:54:40 +02:00
parent 2cb6982113
commit 6acf0f745f
2 changed files with 4 additions and 1 deletions
cmake
SIPMacros.cmake
ms-windows/osgeo4w
package.cmd

4
cmake/SIPMacros.cmake

@ -92,6 +92,10 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP CPP_FILES)
ENDIF(MSVC)
ENDIF(PEDANTIC)
IF(MSVC)
ADD_DEFINITIONS( /bigobj )
ENDIF(MSVC)
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})
SET(SUPPRESS_SIP_WARNINGS FALSE CACHE BOOL "Hide SIP warnings")
MARK_AS_ADVANCED(SUPPRESS_SIP_WARNINGS)

1
ms-windows/osgeo4w/package.cmd

@ -342,7 +342,6 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-server/%PACKAGENAME
"apps/%PACKAGENAME%/bin/wms_metadata.xml" ^
"apps/%PACKAGENAME%/bin/schemaExtension.xsd" ^
"apps/%PACKAGENAME%/python/qgis/_server.pyd" ^
"apps/%PACKAGENAME%/python/qgis/_server.lib" ^
"apps/%PACKAGENAME%/python/qgis/server/" ^
"httpd.d/httpd_%PACKAGENAME%.conf.tmpl" ^
"etc/postinstall/%PACKAGENAME%-server.bat" ^