annotate src/msvc-build-cmake-1.patch @ 3865:4e204ea06bc8

qt.mk: only depend on fontconfig if $(USE_SYSTEM_FONTCONFIG) is set to "no"
author John W. Eaton <jwe@octave.org>
date Thu, 26 Mar 2015 09:05:37 -0400
parents d468ce1eb636
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3146
d468ce1eb636 [MSVC] fix cmake for use with clgcc/clg++
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur cmake-2.8.9-orig/Modules/Platform/Windows.cmake cmake-2.8.9/Modules/Platform/Windows.cmake
d468ce1eb636 [MSVC] fix cmake for use with clgcc/clg++
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- cmake-2.8.9-orig/Modules/Platform/Windows.cmake 2012-08-09 14:15:19 -0400
d468ce1eb636 [MSVC] fix cmake for use with clgcc/clg++
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
3 +++ cmake-2.8.9/Modules/Platform/Windows.cmake 2013-07-17 09:59:10 -0400
d468ce1eb636 [MSVC] fix cmake for use with clgcc/clg++
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -8,6 +8,7 @@
d468ce1eb636 [MSVC] fix cmake for use with clgcc/clg++
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 SET(CMAKE_IMPORT_LIBRARY_SUFFIX ".lib")
d468ce1eb636 [MSVC] fix cmake for use with clgcc/clg++
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6 SET(CMAKE_EXECUTABLE_SUFFIX ".exe") # .exe
d468ce1eb636 [MSVC] fix cmake for use with clgcc/clg++
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7 SET(CMAKE_LINK_LIBRARY_SUFFIX ".lib")
d468ce1eb636 [MSVC] fix cmake for use with clgcc/clg++
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 +SET(CMAKE_LINK_LIBRARY_FLAG "")
d468ce1eb636 [MSVC] fix cmake for use with clgcc/clg++
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 SET(CMAKE_DL_LIBS "")
d468ce1eb636 [MSVC] fix cmake for use with clgcc/clg++
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10
d468ce1eb636 [MSVC] fix cmake for use with clgcc/clg++
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11 SET(CMAKE_FIND_LIBRARY_PREFIXES "")