[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r3838: Disable incremental linking for debug builds when building w (vidalia/branches/breakpad/src)



Author: edmanm
Date: 2009-06-11 02:52:48 -0400 (Thu, 11 Jun 2009)
New Revision: 3838

Modified:
   vidalia/branches/breakpad/src/CMakeLists.txt
Log:

Disable incremental linking for debug builds when building with Visual Studio
(CMake disables it by default for Release builds anyway), otherwise it seems
to go retarded trying to find SxS assemblies when building vidalia.exe with
Breakpad support.


Modified: vidalia/branches/breakpad/src/CMakeLists.txt
===================================================================
--- vidalia/branches/breakpad/src/CMakeLists.txt	2009-06-11 06:38:12 UTC (rev 3837)
+++ vidalia/branches/breakpad/src/CMakeLists.txt	2009-06-11 06:52:48 UTC (rev 3838)
@@ -29,6 +29,15 @@
   ## built-in type, so we need to do that as well otherwise we get linker
   ## errors due to name mangling if we try to use a wchar_t-related method
   add_definitions(/Zc:wchar_t-)
+
+  ## Disable incremental linking for all build types, not just Release
+  ## and MinSizeRel
+  set(CMAKE_EXE_LINKER_FLAGS_DEBUG
+      "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /INCREMENTAL:NO"
+  )
+  set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
+      "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /INCREMENTAL:NO"
+  )
 endif(MSVC)
 
 ## Add some Qt definitions