Skip to content

Commit

Permalink
Re #8882. Trying to get win32 build working.
Browse files Browse the repository at this point in the history
  • Loading branch information
RussellTaylor committed Mar 3, 2014
1 parent 600a674 commit a25919f
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions Code/Mantid/Build/CMake/WindowsSetup.cmake
Expand Up @@ -45,15 +45,15 @@ endif ()
# Set PCH heap limit, the default does not work when running msbuild from the commandline for some reason
# Any other value lower or higher seems to work but not the default. It it is fine without this when compiling
# in the GUI though...
SET( VISUALSTUDIO_COMPILERHEAPLIMIT 150 )
#SET( VISUALSTUDIO_COMPILERHEAPLIMIT 150 )
# It make or may not already be set so override if it is (assumes if in CXX also in C)
if ( CMAKE_CXX_FLAGS MATCHES "(/Zm)([0-9]+)" )
string ( REGEX REPLACE "(/Zm)([0-9]+)" "\\1${VISUALSTUDIO_COMPILERHEAPLIMIT}" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} )
string ( REGEX REPLACE "(/Zm)([0-9]+)" "\\1${VISUALSTUDIO_COMPILERHEAPLIMIT}" CMAKE_C_FLAGS ${CMAKE_C_FLAGS} )
else()
set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Zm${VISUALSTUDIO_COMPILERHEAPLIMIT}" )
set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm${VISUALSTUDIO_COMPILERHEAPLIMIT}" )
endif()
#if ( CMAKE_CXX_FLAGS MATCHES "(/Zm)([0-9]+)" )
# string ( REGEX REPLACE "(/Zm)([0-9]+)" "\\1${VISUALSTUDIO_COMPILERHEAPLIMIT}" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} )
# string ( REGEX REPLACE "(/Zm)([0-9]+)" "\\1${VISUALSTUDIO_COMPILERHEAPLIMIT}" CMAKE_C_FLAGS ${CMAKE_C_FLAGS} )
#else()
# set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Zm${VISUALSTUDIO_COMPILERHEAPLIMIT}" )
# set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm${VISUALSTUDIO_COMPILERHEAPLIMIT}" )
#endif()


###########################################################################
Expand Down

0 comments on commit a25919f

Please sign in to comment.