summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmLocalVisualStudio7Generator: Rename local 'lang' varBrad King2014-08-131-3/+3
| | | | | In the WriteGroup method, rename the 'lang' var to 'ppLang' since it is specifically for the preprocessor definitions language selection.
* VS: Refactor include directory generation in .vcxproj filesBrad King2014-08-133-23/+19
| | | | | | | | Use the cmVisualStudioGeneratorOptions flag map to add the AdditionalIncludeDirectories element to the project file. Move appending of %(AdditionalIncludeDirectories) to the locations that populate the flag vectors instead of where they are written out.
* VS: Refactor include directory slash conversionBrad King2014-08-131-3/+6
| | | | | Convert each include directory to windows slashes once instead of repeating it each time they are written out to the project file.
* cmIDEOptions: Add HasFlag method to test if a flag is setBrad King2014-08-132-0/+7
|
* cmIDEOptions: Add an AppendFlag overload to append multiple valuesBrad King2014-08-132-0/+10
|
* CMake Nightly Date StampKitware Robot2014-08-131-1/+1
|
* Merge topic 'vs-windows-sdk-desktop-arm'Brad King2014-08-124-1/+16
|\ | | | | | | | | | | | | 2b20110f MSVC: Select default standard libraries for ARM platform 2dfcf0ed VS: Fix generation of desktop applications for ARM dbb5a7ee CMakeDetermineCompilerId: Fix detection for VS ARM platform
| * MSVC: Select default standard libraries for ARM platformBrad King2014-08-121-1/+5
| | | | | | | | For Windows ARM targets, only kernel32.lib and user32.lib are standard.
| * VS: Fix generation of desktop applications for ARMGilles Khouzam2014-08-121-0/+5
| | | | | | | | | | | | Add WindowsSDKDesktopARMSupport to the .vcxproj to avoid 'error MSB8022: Compiling Desktop applications for the ARM platform is not supported.' from VS.
| * CMakeDetermineCompilerId: Fix detection for VS ARM platformBrad King2014-08-122-0/+6
| | | | | | | | | | | | | | | | | | Add WindowsSDKDesktopARMSupport to the compiler id .vcxproj to avoid 'error MSB8022: Compiling Desktop applications for the ARM platform is not supported.' from VS. Inspired-by: Minmin Gong <minmin.gong@gmail.com> Inspired-by: Gilles Khouzam <gillesk@microsoft.com>
* | Merge topic 'vs-windows-phone-and-store'Brad King2014-08-1222-5/+271
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d3d9a22 Help: Add notes for topic 'vs-windows-phone-and-store' 401a00d9 VS: Set WindowsPhone and WindowsStore min VS version required 709cebde VS: Generate WindowsPhone and WindowsStore application types 72395ab2 VS: Add .sln "Deploy" mark for WindowsPhone and WindowsStore binaries 2074f581 MSVC: Add system libs for WindowsPhone and WindowsStore c72f0887 MSVC: Add default WindowsPhone and WindowsStore compile flags 1c94558a MSVC: Disable incremental linking for WindowsPhone and WindowsStore 592098e2 Define 'WINDOWS_PHONE' and 'WINDOWS_STORE' variables aa42a78f Add WindowsPhone and WindowsStore platform information modules b94ddf6c CMakeDetermineCompilerId: Recognize WindowsPhone and WindowsStore d7938bff VS: Select WindowsPhone and WindowsStore default toolsets 3abd150c VS: Save WindowsPhone and WindowsStore system internally
| * Help: Add notes for topic 'vs-windows-phone-and-store'Brad King2014-08-051-0/+10
| |
| * VS: Set WindowsPhone and WindowsStore min VS version requiredGilles Khouzam2014-07-311-0/+12
| | | | | | | | | | Generate the MinimumVisualStudioVersion element in the .vcxproj file based on the version of WindowsPhone or WindowsStore to be targeted.
| * VS: Generate WindowsPhone and WindowsStore application typesGilles Khouzam2014-07-312-0/+23
| | | | | | | | | | Generate the ApplicationType and ApplicationTypeRevision elements in .vcxproj files.
| * VS: Add .sln "Deploy" mark for WindowsPhone and WindowsStore binariesGilles Khouzam2014-07-312-0/+17
| |
| * MSVC: Add system libs for WindowsPhone and WindowsStoreBrad King2014-07-311-1/+5
| | | | | | | | | | Use the libraries that are added by default by the VS 2013 IDE for Windows Phone and Windows Store projects.
| * MSVC: Add default WindowsPhone and WindowsStore compile flagsPaul Annetts2014-07-311-0/+4
| | | | | | | | Also set the list of standard libraries to empty.
| * MSVC: Disable incremental linking for WindowsPhone and WindowsStoreGilles Khouzam2014-07-311-4/+6
| | | | | | | | | | Do not add a "/INCREMENTAL" flag when using the toolchains for these systems.
| * Define 'WINDOWS_PHONE' and 'WINDOWS_STORE' variablesGilles Khouzam2014-07-314-0/+16
| | | | | | | | | | Set one of these when CMAKE_SYSTEM_NAME is "WindowsPhone" or "WindowsStore", respectively.
| * Add WindowsPhone and WindowsStore platform information modulesBrad King2014-07-316-0/+6
| | | | | | | | | | | | | | Simply include the "Windows" platform equivalents. This will allow -DCMAKE_SYSTEM_NAME=WindowsPhone or -DCMAKE_SYSTEM_NAME=WindowsStore to select variants of the Windows platform while re-using most of the platform information from "Windows".
| * CMakeDetermineCompilerId: Recognize WindowsPhone and WindowsStoreGilles Khouzam2014-07-312-0/+14
| | | | | | | | | | | | | | | | | | When CMAKE_SYSTEM_NAME is set to target one of these, add ApplicationType and ApplicationTypeRevision elements to the .vcxproj file used to identify the compiler so that the WindowsPhone or WindowsStore toolchains can work. Co-Author: Brad King <brad.king@kitware.com>
| * VS: Select WindowsPhone and WindowsStore default toolsetsBrad King2014-07-316-1/+139
| | | | | | | | | | | | | | | | Teach the VS >= 10 generators to recognize these system names and select the appropriate default toolset for the system version. Report an error when the version is not known to be supported by VS. Inspired-by: Gilles Khouzam <gillesk@microsoft.com>
| * VS: Save WindowsPhone and WindowsStore system internallyBrad King2014-07-312-0/+20
| | | | | | | | | | | | | | | | Add boolean members to the VS >= 10 global generator to save whether CMAKE_SYSTEM_NAME is WindowsPhone or WindowsStore without having to repeat a string comparison. Inspired-by: Gilles Khouzam <gillesk@microsoft.com>
* | Merge branch 'release'Brad King2014-08-120-0/+0
|\ \
| * \ Merge branch 'backport-OpenRISC-1000-support' into releaseBrad King2014-08-112-0/+8
| |\ \
| | * | KWSys CPU: Add support for OpenRISC 1000Christian Svensson2014-08-071-0/+4
| | | |
| | * | KWIML: Teach ABI.h about OpenRISC 1000Christian Svensson2014-08-071-0/+4
| | | | | | | | | | | | | | | | It defines __or1k__ and is big endian.
* | | | Merge topic 'fujitsu-compiler-id'Brad King2014-08-122-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 0578c283 Add Fujitsu compiler detection
| * | | | Add Fujitsu compiler detectionErik Lindahl2014-08-112-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Fujitsu C/C++ compilers are the default ones for K computer. Detect both native and cross compilers by looking for the __FUJITSU preprocessor definition.
* | | | | Merge topic 'update-kwsys'Brad King2014-08-127-136/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c32d43c Merge branch 'upstream-kwsys' into update-kwsys 137a0251 KWSys 2014-08-11 (32023afd) 51c82c3a Merge branch 'upstream-kwsys' into update-kwsys fe587db4 KWSys 2014-08-07 (4d526097)
| * \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-08-111-0/+4
| |\ \ \ \ \
| | * | | | | KWSys 2014-08-11 (32023afd)KWSys Robot2014-08-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 32023afd | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 4d526097..32023afd Christian Svensson (1): 32023afd CPU: Add support for OpenRISC 1000 Change-Id: Ie926eea76838b4ce7bcd7b23235f80c0f66c9d4c
| * | | | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-08-116-136/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | KWSys 2014-08-07 (4d526097)KWSys Robot2014-08-116-136/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 4d526097 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' e787837a..4d526097 Brad King (2): 4791701a SystemTools: Remove ConvertWindowsCommandLineToUnixArguments method 4d526097 Add assert() to quiet Clang scan-build warnings Change-Id: I15e4ad710a8ad01f96761a89f2c1517f3c2aa835
* | | | | | | CMake Nightly Date StampKitware Robot2014-08-121-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'release'Brad King2014-08-110-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'backport-BundleUtilities-os9-newlines' into releaseBrad King2014-08-111-0/+1
| |\ \ \ \ \
| | * | | | | BundleUtilities: Allow Info.plist files which use CR line endingsTim Blechmann2014-08-071-0/+1
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Convert \r to our internal end-of-line character just as we do \n. Signed-off-by: Tim Blechmann <tim@klingt.org>
| * | | | | Merge branch 'backport-fix-CMP0047-IS_GNU-vars' into releaseBrad King2014-08-111-0/+8
| |\ \ \ \ \
| | * | | | | CMP0047: Fix CMAKE_COMPILER_IS_GNU(CC|CXX) in OLD behaviorBrad King2014-08-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of CMP0047 detects the QNX compiler id internally, then changes it to GNU after the language is fully enabled. This is too late to correctly set the old IS_GNU variables, so set them as part of the policy OLD behavior. Reported-by: Mike Lattanzio <mlattanzio@blackberry.com>
| * | | | | | Merge branch 'fix-Qt-Autogen' into releaseBrad King2014-08-118-7/+84
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'wix-acl'Brad King2014-08-1110-4/+246
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 975dc871 Help: Add notes for topic 'wix-acl' 12418f5c CPackWIX: Implement CPACK_WIX_ACL (Access Control List) property
| * | | | | | | Help: Add notes for topic 'wix-acl'Brad King2014-08-111-0/+6
| | | | | | | |
| * | | | | | | CPackWIX: Implement CPACK_WIX_ACL (Access Control List) propertyNils Gladitz2014-08-099-4/+240
| | | | | | | |
* | | | | | | | Merge topic 'update-kwiml'Brad King2014-08-111-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45ab21ee Merge branch 'upstream-kwiml' into update-kwiml 3c0bb281 KWIML: Teach ABI.h about OpenRISC 1000
| * \ \ \ \ \ \ \ Merge branch 'upstream-kwiml' into update-kwimlBrad King2014-08-071-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | KWIML: Teach ABI.h about OpenRISC 1000Christian Svensson2014-08-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It defines __or1k__ and is big endian.
* | | | | | | | | | Merge topic 'BundleUtilities-os9-newlines'Brad King2014-08-111-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 810f5cce BundleUtilities: Allow Info.plist files which use CR line endings
| * | | | | | | | | | BundleUtilities: Allow Info.plist files which use CR line endingsTim Blechmann2014-08-071-0/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert \r to our internal end-of-line character just as we do \n. Signed-off-by: Tim Blechmann <tim@klingt.org>
* | | | | | | | | | Merge topic 'fix-CMP0047-IS_GNU-vars'Brad King2014-08-111-0/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70796ef0 CMP0047: Fix CMAKE_COMPILER_IS_GNU(CC|CXX) in OLD behavior
generated by cgit v0.12 at 2024-11-15 10:58:07 (GMT)