kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
17,369 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

17369 Commits

Author SHA1 Message Date
Alex Neundorf e78ce44b35 Fix automoc with VS builds: apply patch from Bill 
This patch moves the creation of VS GUIDs from the final pass
to AddHelperCommands() and should fix the failing automoc tests
with VS.

Alex
 2011-08-18 19:35:41 +02:00
Alex Neundorf 71165e943e Silence warning in automoc: use long instead of int 
Alex
 2011-08-18 19:34:49 +02:00
Alex Neundorf 1879bcc09c Fix build: use std::ios::out|ios::trunc instead of std::ios_base::out 
Alex
 2011-08-18 18:53:14 +02:00
Alex Neundorf a6ccf3cb65 Use $(CXXFLAGS) and $(LDFLAGS) in the --find-package test Makefile 
This should make the test succeed in the coverage builds, where CXXFLAGS
and LDFLAGS are set accordingly.

Alex
 2011-08-18 18:43:33 +02:00
Alex Neundorf 43869188af Fix line length 
Alex
 2011-08-18 18:39:05 +02:00
Bill Hoffman 3ca1df8e59 Use MSBuild when devenv is not around, since VCExpress seems broken. 
To support Intel Fortran, CMake started using devenv and VCExpress
for build tools with VS2010.  However, VCExpress does not always work.
This change makes CMake use MSBuild when devenv is not found. This should
be OK, since Intel Fortran can not be used with VCExpress.
 2011-08-18 12:18:30 -04:00
Stephen Kelly 42154ec01c Fix up the regex command for Intel. 2011-08-18 13:29:06 +02:00
KWSys Robot d7184e0e4d KWSys Nightly Date Stamp 2011-08-18 00:13:09 -04:00
Alex Neundorf 678e124481 Only enable the automoc test after checking that Qt4 works 
On some systems which contribute nightly builds there were strange
errors which seemed to hint that the installed Qt4 is not usable/
not usable with this compiler. So first check whether it works,
and only if this was successful, enable the test.

Alex
 2011-08-18 00:16:02 +02:00
Alex Neundorf 7d693108fa Only enable the test when using GNU make 
The makefile used in the test uses $(shell ...), which is
AFAIK a GNU extension, and will probably not work e.g. with OpenBSD make.
According to the FreeBSD make manpage their make has a != assignment,
which seems to do something similar, but I don't have such a system
around for testing.
Also, the point of this test is not to write a portable makefile,
but to check whether cmake --find-package prints a correct string.

Alex
 2011-08-17 23:44:34 +02:00
Alex Neundorf 3011149947 Make the test harder by always having a space in the include dirs 
The commit message for the previous commit was wrong, it should
have been: fix the test by using $(shell ...) syntax instead
of backticks in the Makefile.
With backticks I couldn't get the quoting right.
Printing -I"/some/path with space" did not work, the compiler
complained that there is not file "with". Also backslashes in
different numbers did not make it work.

Alex
 2011-08-17 22:53:35 +02:00
Alex Neundorf ab57ff6156 Make the --find-package test harder 
Now it is guaranteed that the include paths always contain a space.
This should make the cont. build fail.

Alex
 2011-08-17 22:51:57 +02:00
Alex Neundorf 71c29d11b3 Fix bootstrap test with automoc 
Alex
 2011-08-17 17:08:50 +02:00
Stephen Kelly a147a069a5 Add some settings for non-truncation of test output. 2011-08-17 14:03:12 +02:00
Stephen Kelly bf73e75941 Hopefully add version extraction for Intel. 2011-08-17 13:37:57 +02:00
Stephen Kelly aa4f0b6ba8 Fix the version extraction regex for clang. 2011-08-17 13:32:48 +02:00
Stephen Kelly a493d1a353 Test the correct cxx variable. 2011-08-17 13:32:20 +02:00
KWSys Robot 721133dc45 KWSys Nightly Date Stamp 2011-08-17 00:10:16 -04:00
Stephen Kelly b6ee2ee03a Comment the test assertion for now 
At least until I know which gcc versions do not pass.
 2011-08-17 02:42:09 +02:00
Stephen Kelly a9a8b9e8d1 Exclude win32 from hidden visibility checks. 2011-08-17 02:40:56 +02:00
Stephen Kelly afae7a95a0 Start testing expected values for compiler flags. 
Should help catch unhandled flag warnings so far not handled by
check_cxx_compiler_flag FAIL_REGEXen.
 2011-08-17 02:36:22 +02:00
Alex Neundorf cd70f00ea4 Fix #12358: make optionally enabling ASM work again 
Alex
 2011-08-17 01:00:28 +02:00
Alex Neundorf afb3edc181 Fix warnings 
Alex
 2011-08-17 00:49:12 +02:00
Alex Neundorf add30e9008 Fix build: non-void function must return a value 
Alex
 2011-08-17 00:39:21 +02:00
Alex Neundorf 7e6d84568c Automoc.cmake is not needed anymore 
(actually I thought I had already removed it again)

Alex
 2011-08-17 00:04:47 +02:00
Alex Neundorf 2963d0b078 Fix logic which decides when to execute automoc test 
Alex
 2011-08-16 23:48:01 +02:00
David Cole 7b044105ce Merge topic 'add-vs9-midl-inc-dirs' 
ac22e2a VS9: Add include_directories to midl command lines
 2011-08-16 17:03:15 -04:00
David Cole f0d46582c3 Merge topic 'FindGetTextImprovements' 
bebb2bc Support REQUIRED in FindGettext.cmake (using FPHSA.cmake)
431c8eb Add macros GETTEXT_PROCESS_POT() and GETTEXT_PROCESS_PO_FILES()
 2011-08-16 17:03:12 -04:00
David Cole 829ce746ca Merge topic 'fix-12323-more-paths-in-finddcmtk' 
0167cea Add more find_path locations for DCMTK header files (#12323)
 2011-08-16 17:03:09 -04:00
David Cole bdedae4b95 Merge topic 'fix-clang-flag-check-issue-12394' 
ed6be50 Fix CHECK_(C|CXX)_COMPILER_FLAG for Clang (#12394)
 2011-08-16 17:03:05 -04:00
David Cole 674be27a7f Merge topic 'WriteConfigVersionFile_2TemplateFiles' 
c9761de Improve documentation for WriteBasicConfigVersionFile.cmake
208bb90 Set UNSUITABLE instead of not COMPATIBLE
bb03c2d Really fix copyright notice
d50a61a Fix copyright notice
4ba09bc Add some tests for write_basic_config_version_file()
02b1e4b Add example to documentation
d216a67 Provide macro write_basic_config_version_file()
 2011-08-16 17:03:00 -04:00
David Cole 47a8d4f22c Merge topic 'fix-10941-correct-comments' 
edcdfea Documentation: Fix comments in the source code (#10941)
 2011-08-16 17:02:52 -04:00
David Cole b38bf726f4 Merge topic 'enable-parallel-xcode-builds' 
312d68d Xcode: Rearrange CMakeReRun to enable parallel builds
 2011-08-16 17:02:48 -04:00
David Cole 522c263d9d Merge topic 'fix-imported-target-depend-crash' 
8ee9bbb Do not crash when an imported target depends on a missing target
 2011-08-16 17:02:43 -04:00
David Cole e1d4a73be0 Merge topic 'fix-12259-quote-commas-for-xcode' 
d87eb35 Xcode: Quote ',' in Xcode string values (#12259)
 2011-08-16 17:02:38 -04:00
David Cole b16de67e8f Merge topic 'FindX11ImprovementsFromKDE' 
6899e58 Also search for libxkbfile, XSync and SM include dir
fe6bb7a Remove trailing whitespace
 2011-08-16 17:02:30 -04:00
David Cole 0923610b6d Merge topic 'fix-11746-sort-failed-tests-output' 
4575ed9 Fix line too long style violation
ba4886b CTest: print failed tests in index order (#11746)
 2011-08-16 17:02:23 -04:00
David Cole e9a943bab2 Merge topic 'fix-12054-eliminate-findjava-noise' 
f462369 remove extra output message from FindJava.cmake
 2011-08-16 17:02:11 -04:00
David Cole dfb307fef5 Merge topic 'fix-old-VisualAge-Fortran' 
ad542d8 XL: Fix old VisualAge branding of Fortran compiler
 2011-08-16 17:01:47 -04:00
David Cole 39743b9060 Merge topic 'hdf5-module-12316-fix' 
ad218e4 Added HDF5 high level Fortran bindings to available components.
 2011-08-16 17:01:39 -04:00
David Cole a772f21a7d Merge topic 'intel_fortran_vs2010' 
3c53fbb Fix custom commands in VS2010 Fortran projects using CFG_INTDIR and test.
 2011-08-16 17:01:33 -04:00
David Cole 6d5819ca6c Merge topic 'fix-8707-add-vs-globals' 
37d8602 Merge topic 'intel_fortran_vs2010' into fix-8707-add-vs-globals
6c72d25 Initial support for Intel Fortran VS2010.
 2011-08-16 17:01:28 -04:00
Alex Neundorf 626fc717c6 Much improved test, should now be executed on all UNIXes 
Instead of relying on that some development package is installed on the
system, now a tiny library is built, which is the searched and used
during the test.

Alex
 2011-08-16 22:31:26 +02:00
Alex Neundorf 77a5c6e0d8 Add documentation for AUTOMOC, add initialization via CMAKE_AUTOMOC 
Alex
 2011-08-16 22:05:33 +02:00
KWSys Robot 2bfd55a7c6 KWSys Nightly Date Stamp 2011-08-16 00:14:06 -04:00
Alex Neundorf bf8ef778a3 Add a test for automoc 
The files are taken from the Qt examples. They are BSD licensed, so it
should be fine. I only edited main.cpp to use both widgets.

Alex
 2011-08-16 02:13:26 +02:00
Alex Neundorf d045fd4ec5 Nicer progress message for the automoc target 
Alex
 2011-08-16 02:00:36 +02:00
Alex Neundorf 50cd6cef92 Move automoc processing from add_executable/library to cmGlobalGenerator 
Now automoc is enabled by setting the AUTOMOC target property to true,
instead of using the AUTOMOC keyword in add_executable() or add_library()

Alex
 2011-08-16 01:45:05 +02:00
Alex Neundorf cbaac2a587 Remove trailing whitespace 
Alex
 2011-08-16 01:44:13 +02:00
Alex Neundorf c27607baf8 Refactor SetupAutomocTarget() so it can be run after creating the target 
This makes it easier to move it from InitialPass() to some other
location, e.g. FinalPass() or something else.

Alex
 2011-08-16 01:27:30 +02:00