From da60509dac82e7eb593cfd981733f2faaa547ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 21 Jun 2012 14:39:45 +0000 Subject: [PATCH] Don't add largeaddressaware if building with mingw git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@606 fdac6126-5c0c-442c-9429-916003d36597 --- cmake/ACGCompiler.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmake/ACGCompiler.cmake b/cmake/ACGCompiler.cmake index 2be45e90..2103919a 100644 --- a/cmake/ACGCompiler.cmake +++ b/cmake/ACGCompiler.cmake @@ -15,9 +15,11 @@ if ( WIN32 ) set( ADDITIONAL_CMAKE_MODULE_LINKER_FLAGS ) if ( WINDOWS_LARGE_MEMORY_SUPPORT ) - list(APPEND ADDITIONAL_CMAKE_EXE_LINKER_FLAGS "/LARGEADDRESSAWARE" ) - list(APPEND ADDITIONAL_CMAKE_SHARED_LINKER_FLAGS "/LARGEADDRESSAWARE" ) - list(APPEND ADDITIONAL_CMAKE_MODULE_LINKER_FLAGS "/LARGEADDRESSAWARE" ) + if( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles") + list(APPEND ADDITIONAL_CMAKE_EXE_LINKER_FLAGS "/LARGEADDRESSAWARE" ) + list(APPEND ADDITIONAL_CMAKE_SHARED_LINKER_FLAGS "/LARGEADDRESSAWARE" ) + list(APPEND ADDITIONAL_CMAKE_MODULE_LINKER_FLAGS "/LARGEADDRESSAWARE" ) + endif() endif()