Commit Graph

17458 Commits

Author SHA1 Message Date
David Cole 6ac35e5cb3 Merge topic 'import-KWIML'
5be0e92 Merge branch 'upstream-kwiml' into import-KWIML
a8f6159 KWIML: Create test output dir for Xcode
33fff24 KWIML: No INT_SCN*8 on Intel for Windows
bcc06d4 KWIML: No INT_SCN*8 on SunPro compiler
6d12ab3 KWIML: Suppress printf/scanf format warnings in test
553acec KWIML: Avoid redefining _CRT_SECURE_NO_DEPRECATE in test.h
93cebca Configure KWIML inside CMake as cmIML
b2975ad Merge branch 'upstream-kwiml' into import-KWIML
831bade KWIML: The Kitware Information Macro Library
2011-11-15 14:39:12 -05:00
David Cole c616f46fc5 Merge topic 'copyright-year'
ac39e9c Update main Copyright.txt year range for 2011
2011-11-15 14:39:08 -05:00
David Cole 6fbba223f4 Merge topic 'FindBoost-vs11-issue-12568'
1c4ba48 FindBoost: Use MSVC11 to find Boost on Windows (#12568)
2011-11-15 14:39:03 -05:00
David Cole 1e055d374e Merge topic 'automoc_qt5'
bafe5cc Fix style.
74b9392 Update comments and method names to not be Qt4 specific.
812dab0 Don't assume the existence of QT_MAJOR_VERSION.
2011-11-15 14:39:00 -05:00
David Cole f1197ff0da Merge topic 'fix-11213-vs10-mfc-support'
537020f Tests: Nudge MFC test to pass on VS 6 dashboards (#11213)
51f442e VS11: Update InstallRequiredSystemLibraries.cmake for VS11 (#11213)
d85ab7a Tests: Add environment logging to the MFC test (#11213)
011694c VS10: Use expected values for UseOfMfc (#11213)
a2e6d24 Tests: Fix MFC test to work with VS 10 and later (#11213)
2011-11-15 14:38:56 -05:00
David Cole 608d05b469 Merge topic 'add-mfc-test'
c71f7ab Tests: Avoid MFC test automatically for Watcom WMake builds (#11213)
a42e3f2 Tests: Fix MFC test for old vs6 dashboards (#11213)
b297da6 Tests: Fix MFC test w/ Make-based generators (#11213)
54595e6 Tests: Avoid MFC test automatically for VCExpress builds (#11213)
36b0c43 Tests: Add the MFC test (#11213)
2011-11-15 14:38:52 -05:00
David Cole 151850ed03 Merge topic 'findx11-dan-kegel-patch'
0e721e5 Modules: Add XRes to FindX11.cmake
2011-11-15 14:38:48 -05:00
Brad King 5be0e92218 Merge branch 'upstream-kwiml' into import-KWIML 2011-11-15 14:30:58 -05:00
Brad King a8f6159f69 KWIML: Create test output dir for Xcode
Xcode 2.x forgets to create the target output directory before linking
the individual architecture pieces of a universal binary for the target
KWIML_test.  Then it passes the directory to -L and -F options when
linking the and warns that the directory does not exist.  We work around
the problem by using a pre-build rule on the target to create the output
directory.
2011-11-14 07:54:10 -05:00
KWSys Robot 590c37e207 KWSys Nightly Date Stamp 2011-11-14 00:05:04 -05:00
Brad King 33fff24aca KWIML: No INT_SCN*8 on Intel for Windows
Intel C/C++ for Windows does not support the SCN*8 format (%hh*).
The MS runtime does not support it.
2011-11-13 15:06:12 -05:00
Brad King 5d6cb1308d KWSys: Fix wrong spelling of __INTEL_COMPILER
Author: Hans Johnson <hans-johnson@uiowa.edu>
Change-Id: I31a29a8b53e5262b76530b8ea80a1a66cff7b3f7
2011-11-13 12:35:04 -05:00
Brad King 2f8f7ec56a KWSys: Remove trailing whitespace in SystemTools.cxx 2011-11-13 12:25:05 -05:00
KWSys Robot 9aa10f8045 KWSys Nightly Date Stamp 2011-11-13 11:32:56 -05:00
Brad King bcc06d498c KWIML: No INT_SCN*8 on SunPro compiler
The Sun compiler does not document support for SCN*8 format (%hh*).
It works only on platforms that happen to provide a runtime library
that supports the format.
2011-11-12 10:10:07 -05:00
Brad King 6d12ab3f89 KWIML: Suppress printf/scanf format warnings in test
KWIML defines format string macros matching the fixed-sized types.  This
test checks that they behave as expected and that the arguments match
the *sizes* expected by the format strings.
2011-11-12 09:39:40 -05:00
Brad King 553acec76b KWIML: Avoid redefining _CRT_SECURE_NO_DEPRECATE in test.h
If the including project defines this macro do not re-define it
in the test header.
2011-11-12 08:00:13 -05:00
KWSys Robot b90b6969f6 KWSys Nightly Date Stamp 2011-11-11 00:10:05 -05:00
Mateusz Loskot 1c4ba48e44 FindBoost: Use MSVC11 to find Boost on Windows (#12568)
While at it, add recent Boost versions.
2011-11-10 08:03:17 -05:00
Brad King ac39e9c765 Update main Copyright.txt year range for 2011 2011-11-10 07:56:31 -05:00
KWSys Robot 131d0ae4fc KWSys Nightly Date Stamp 2011-11-10 00:10:58 -05:00
Stephen Kelly bafe5cc6e9 Fix style. 2011-11-10 00:57:21 +01:00
Stephen Kelly 74b9392eb9 Update comments and method names to not be Qt4 specific. 2011-11-09 23:26:09 +01:00
Stephen Kelly 812dab067e Don't assume the existence of QT_MAJOR_VERSION.
Also handle Qt5SrcTools_MAJOR_VERSION.
2011-11-09 23:20:20 +01:00
David Cole 537020f958 Tests: Nudge MFC test to pass on VS 6 dashboards (#11213)
InstallRequiredSystemLibraries does not install any dlls when
used with VS 6 dashboards. Modify the ValidateBuild script to
expect only 1 file when building with VS 6.

Using "-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>" does not work when
<INSTALL_DIR> evaluates to a long enough string. However, using
"-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>" does work, even with
the longer strings. So: make sure to include the ":PATH" when using
this construct with ExternalProject calls so that they may install
to the proper location on VS 6 builds. All existing calls that match
"CMAKE_INSTALL_PREFIX.*INSTALL_DIR" include the ":PATH" after this
commit.

By the way: https://twitter.com/DLRdave/status/134339505397309440
2011-11-09 13:35:28 -05:00
Dan Kegel 0e721e5129 Modules: Add XRes to FindX11.cmake 2011-11-09 06:22:32 -05:00
KWSys Robot 5675ec5e49 KWSys Nightly Date Stamp 2011-11-09 00:10:28 -05:00
David Cole 51f442e603 VS11: Update InstallRequiredSystemLibraries.cmake for VS11 (#11213)
Should fix the newly added MFC test on VS11 dashboards.
2011-11-08 15:22:40 -05:00
David Cole d85ab7a412 Tests: Add environment logging to the MFC test (#11213)
Simply to ease analyzing still-occurring dashboard failures.
2011-11-08 15:13:52 -05:00
David Cole 437deb3356 Merge topic 'CPackRPM-fix12556'
9066886 CPackRPM fix #12556 and enhance documentation
2011-11-08 14:43:52 -05:00
David Cole 6478502efc Merge topic 'fix-typo'
6d51f5f Fix typo.
2011-11-08 14:43:44 -05:00
David Cole a5579b76f0 Merge topic 'FixAutomocFromCCMakeFromPATH'
83d02ee make automoc work when using ccmake via PATH (#12551)
2011-11-08 14:43:38 -05:00
David Cole 5a3a5ba052 Merge topic 'watcom-cmake-shortpath-issue-12548'
23381d8 Watcom: Use shortpath to CMake if full path has parens (#12548)
2011-11-08 14:43:31 -05:00
David Cole a985a9e0f7 Merge topic 'framework-with-space'
e74f374 Fix linking to OS X Frameworks named with spaces (#12550)
2011-11-08 14:43:18 -05:00
David Cole e4085569a9 Merge topic 'FixTargetsInVirtualFoldersForEclipseIndigo'
d31b1ac Eclipse: quote the build dir (to make it work with spaces)
0576331 Eclipse: make targets work from any directory
2011-11-08 14:43:10 -05:00
David Cole 7ee0f580eb Merge topic 'EclipseWarnIfBuildDirIsSubDirOfSrcDir'
4b93022 Eclipse: warn if CMAKE_BINARY_DIR is subdir of CMAKE_SOURCE_DIR
2011-11-08 14:43:02 -05:00
David Cole 3452dadf89 Merge topic 'AddMocOptionsToAutomoc'
2c648ab add documentation for the AUTOMOC_MOC_OPTIONS property
52719a1 automoc: fix #12541, support moc options
2011-11-08 14:42:51 -05:00
David Cole 6c2f30822b Merge topic 'DontCrashAutomocWithEmptyCompileDefs'
1ecc55a Automoc: fix the fix, need to use std::string, not just char* pointer
8c8305f don't crash in automoc with empty COMPILE_DEFINITIONS property
2011-11-08 14:42:46 -05:00
David Cole d8d4e801ac Merge topic 'fix-12549-one-more-SCC-setting'
b0f0b3e VS: Add VS_SCC_AUXPATH target property (#12549)
2011-11-08 14:42:41 -05:00
David Cole 67e3b64ab5 Merge topic 'automoc_qt5'
c208ab8 Also run moc automatically with Qt5.
2011-11-08 14:42:36 -05:00
KWSys Robot 7fe3484f20 KWSys Nightly Date Stamp 2011-11-08 00:11:46 -05:00
KWSys Robot 3de9669e1b KWSys Nightly Date Stamp 2011-11-07 00:10:07 -05:00
KWSys Robot fce8e81895 KWSys Nightly Date Stamp 2011-11-06 00:10:30 -04:00
Eric NOULARD 9066886f9b CPackRPM fix #12556 and enhance documentation
Inspired-By: Chip Christian
2011-11-05 11:40:47 +01:00
KWSys Robot 0727f38f71 KWSys Nightly Date Stamp 2011-11-05 00:08:47 -04:00
Stephen Kelly 6d51f5fa3c Fix typo. 2011-11-04 19:54:18 +01:00
David Cole 011694c269 VS10: Use expected values for UseOfMfc (#11213)
Use expected values for the UseOfMfc xml element in
VS 10 .vcxproj files.

  CMAKE_MFC_FLAG=1 maps to "Static"
  CMAKE_MFC_FLAG=2 maps to "Dynamic"
  all other values map to "false"

Thanks to Randy Schott and McBen for their patches which
served as inspiration and motivation for getting this done.

See also http://public.kitware.com/Bug/view.php?id=11224
2011-11-04 13:29:41 -04:00
David Cole a2e6d2482e Tests: Fix MFC test to work with VS 10 and later (#11213)
The mfc app in the test was generated by the VS 7.1 wizard,
and due to changes in VS since then, the values used for WINVER
and _WIN32_WINNT caused compile errors when built with VS 10
or later. Change them to values appropriate for targeting
Windows XP or later when building with VS 10 or later.

See http://msdn.microsoft.com/en-us/library/6sehtctf.aspx
for more info.
2011-11-04 13:07:38 -04:00
KWSys Robot ae09bab3d6 KWSys Nightly Date Stamp 2011-11-04 00:10:22 -04:00
Alex Neundorf 83d02ee52b make automoc work when using ccmake via PATH (#12551)
In ccmake, cmake::GetCMakeCommand() returns "/cmake" when ccmake
was started from the PATH, i.e. by simply running "ccmake"

Alex
2011-11-03 22:55:42 +01:00