Commit Graph

12409 Commits

Author SHA1 Message Date
KWSys Robot 795221775a KWSys Nightly Date Stamp 2012-01-17 00:05:03 -05:00
KWSys Robot 038ba372fa KWSys Nightly Date Stamp 2012-01-16 00:05:04 -05:00
KWSys Robot 9188dafac1 KWSys Nightly Date Stamp 2012-01-15 00:05:03 -05:00
KWSys Robot c121f3f5c4 KWSys Nightly Date Stamp 2012-01-14 00:05:03 -05:00
Daniel Nelson 3cab24a974 CPack Add top level directory in component install for Archive Generators
This patch fixes bug #0012129
Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
2012-01-13 22:01:53 +01:00
Brad King 8e756d2b9b Tolerate cycles in shared library link interfaces (#12647)
Since commit 183b9509 (Follow all dependencies of shared library private
dependencies, 2011-12-14) we honor LINK_INTERFACE_LIBRARIES when
following dependent shared libraries.  The link interface properties may
form a cycle if set incorrectly by a project.  Furthermore, the property
LINK_DEPENDENT_LIBRARIES may form a cycle if set incorrectly by hand
(though CMake should never generate one).  In either case, do not follow
the cycle forever when following the dependent shared library closure.
We only need to add dependency edges to the constraint graph once.

Add "LinkInterfaceLoop" test to cover this case.
2012-01-13 14:22:24 -05:00
Eric NOULARD 768cf91831 Do not add the content of a file if it's a symlink.
This wasn't necessary for TAR-like (TGZ, TBZ2, etc...) archive
because for those the size was 0. Either there is an error in
upstream libarchive concerning the size or we should not rely
on size of the entry for adding content.
2012-01-13 13:48:14 -05:00
KWSys Robot 50edbf0f22 KWSys Nightly Date Stamp 2012-01-13 00:05:04 -05:00
KWSys Robot c89ee4a10f KWSys Nightly Date Stamp 2012-01-12 00:05:10 -05:00
KWSys Robot bbed901178 KWSys Nightly Date Stamp 2012-01-11 00:05:34 -05:00
KWSys Robot 0020fc4517 KWSys Nightly Date Stamp 2012-01-10 00:05:04 -05:00
Brad King 655a7dd1d4 VS10: Fix /pdb option vcxproj element name (#12328)
The compiler tool uses "ProgramDataBaseFileName" but the linker tool
uses just "ProgramDataBaseFile".  Fix the generator accordingly.
2012-01-09 14:54:45 -05:00
David Cole 9362400d20 Merge topic 'early-exit-loop'
c959725 Exit the loop when we have determined the language.
2012-01-09 14:10:36 -05:00
David Cole 95b701b82a Merge topic 'fix-docs-typo'
9bffb3f Fix typos arguement -> argument.
2012-01-09 14:10:27 -05:00
David Cole 5a5c32e1f2 Merge topic 'update-libarchive'
6c611c6 libarchive: Restore CMake 2.6.3 as minimum version
2f5b677 libarchive: Update README-CMake.txt for new snapshot
156cb3b Merge branch 'libarchive-upstream' into update-libarchive
fd42bf1 libarchive: Set .gitattributes to allow trailing whitespace
4f4fe6e libarchive 3.0.2-r4051 (reduced)
65b6e19 libarchive: Avoid bogus conversion warning from PGI compiler
9ccaeb1 libarchive: Suppress PathScale compiler warnings
2309438 libarchive: Rename isoent_rr_move_dir parameter isoent => curent
b6ca96e libarchive: Include linux/types.h before linux/fiemap.h
f293b73 libarchive: Define _XOPEN_SOURCE=500 on HP-UX
6781a09 libarchive: Cleanup after ZLIB_WINAPI check
f15d757 libarchive: Remove hard-coded build configuration
3a9f449 libarchive: Use Apple copyfile.h API only if available
6af6b96 libarchive: Do not use MNT_NOATIME if not defined
02d5e40 libarchive: Check for 'struct statvfs' member 'f_iosize'
8b7ee30 libarchive: Do not use ST_NOATIME if not defined
...
2012-01-09 14:10:01 -05:00
David Cole 04b6f00bcf Merge topic 'ImproveCPackDoc-part1'
d2c9626 Document undocumented (but existing) cpack options (fix #0010134)
2012-01-09 14:09:50 -05:00
KWSys Robot 99a9205b4b KWSys Nightly Date Stamp 2012-01-09 00:05:03 -05:00
Stephen Kelly c9597259ea Exit the loop when we have determined the language. 2012-01-08 15:41:05 +01:00
Stephen Kelly 9bffb3fcf4 Fix typos arguement -> argument. 2012-01-08 15:32:51 +01:00
KWSys Robot e0d1e7e085 KWSys Nightly Date Stamp 2012-01-08 00:05:09 -05:00
KWSys Robot cad7508615 KWSys Nightly Date Stamp 2012-01-07 00:05:06 -05:00
KWSys Robot 2858f3433a KWSys Nightly Date Stamp 2012-01-06 00:05:03 -05:00
KWSys Robot a823d88149 KWSys Nightly Date Stamp 2012-01-05 00:05:03 -05:00
KWSys Robot d6f59a5293 KWSys Nightly Date Stamp 2012-01-04 00:05:09 -05:00
Eric NOULARD d2c9626d5a Document undocumented (but existing) cpack options (fix #0010134) 2012-01-03 16:47:35 +01:00
KWSys Robot df224727cf KWSys Nightly Date Stamp 2012-01-03 00:05:08 -05:00
Clinton Stimpson 131eed6607 cmake-gui: Improve interrupt granularity to fix bug 12649.
Instead of enabling interrupt only when a progress or message callback is called, add a new callback specifically for
interrupt.  This new callback is called from GetFatalErrorOccured() so cmake-gui can immediately report interrupt status
instead of calling queuing a call to cmSystemTools::SetFatalErrorOccured() and waiting for the progress or message
callback to be called to process that queued call.
2012-01-02 11:07:43 -07:00
KWSys Robot 40aedcbbae KWSys Nightly Date Stamp 2012-01-02 00:05:04 -05:00
KWSys Robot 7ce47e6908 KWSys Nightly Date Stamp 2012-01-01 00:05:04 -05:00
KWSys Robot 3a29d37b16 KWSys Nightly Date Stamp 2011-12-31 00:05:04 -05:00
KWSys Robot add4ad1098 KWSys Nightly Date Stamp 2011-12-30 00:05:04 -05:00
KWSys Robot 15cebeb047 KWSys Nightly Date Stamp 2011-12-29 00:05:05 -05:00
KWSys Robot 38bc4b5d9e KWSys Nightly Date Stamp 2011-12-28 00:05:03 -05:00
KWSys Robot 11385ba56a KWSys Nightly Date Stamp 2011-12-27 00:05:04 -05:00
KWSys Robot 6eb0779dbe KWSys Nightly Date Stamp 2011-12-26 00:05:03 -05:00
KWSys Robot 087b8feee4 KWSys Nightly Date Stamp 2011-12-25 00:05:03 -05:00
KWSys Robot 4fe0206e92 KWSys Nightly Date Stamp 2011-12-24 00:05:04 -05:00
KWSys Robot 9fc5faceea KWSys Nightly Date Stamp 2011-12-23 00:05:05 -05:00
Brad King ffdb37a4f7 Handle libarchive API change in archive_read_data_block
The offset argument type depends on the libarchive version.
2011-12-22 10:52:03 -05:00
KWSys Robot b81ef0533c KWSys Nightly Date Stamp 2011-12-22 00:05:19 -05:00
KWSys Robot b4c2f40653 KWSys Nightly Date Stamp 2011-12-21 00:05:03 -05:00
David Cole cc9319e717 Merge topic 'AddIncludePathForASMToDirectoryInformationFile'
ea68837 fix #12262: dependency scanning for ASM files
2011-12-20 14:21:52 -05:00
David Cole 7ca69a08cb Merge topic 'AddCommentToCDependencyScanner'
318b0cd Add comment about one more problem of the C depency scanner.
4bb08e0 Remove trailing whitespace
2011-12-20 14:21:43 -05:00
David Cole d6a33f6d38 Merge topic 'fix_double_project_cmake_build'
5badf5f Fix the case where cmake --build failed with two project cmds in one file.
2011-12-20 14:21:06 -05:00
David Cole 16dacf3a6a Merge topic 'AutomocFineTuning'
e474dcb automoc: improved warning message in relaxed mode
96fc5d5 automoc: default to strict mode, use CMAKE_AUTOMOC_RELAXED_MODE
2011-12-20 14:20:32 -05:00
Bill Hoffman 5badf5f734 Fix the case where cmake --build failed with two project cmds in one file.
This adds a test that uses two project commands in the same CMakeLists.txt
file.  It also adds a fix so that cmake --build will work in that case.
The fix sets the name of the last project command in the top level
CMakeLists.txt in the cache variable CMAKE_PROJECT_NAME.  This variable
is used by cmake --build to find the project name.
2011-12-20 14:16:25 -05:00
KWSys Robot 4e98500012 KWSys Nightly Date Stamp 2011-12-20 00:05:03 -05:00
KWSys Robot 4bb3edfcb4 KWSys Nightly Date Stamp 2011-12-19 00:05:03 -05:00
Alex Neundorf ea6883752b fix #12262: dependency scanning for ASM files
Now also CMAKE_ASM_INCLUDE_PATH is written into
CMakeDirectoryInformation.cmake, which is necessary to make
the dependency scanning for included files work.

Alex
2011-12-18 19:15:34 +01:00
Alex Neundorf 318b0cdf23 Add comment about one more problem of the C depency scanner.
Alex
2011-12-18 15:44:33 +01:00
Alex Neundorf 4bb08e0a9b Remove trailing whitespace
Alex
2011-12-18 15:42:48 +01:00
KWSys Robot 84094cd155 KWSys Nightly Date Stamp 2011-12-18 00:05:03 -05:00
KWSys Robot 61da11ecd7 KWSys Nightly Date Stamp 2011-12-17 00:05:11 -05:00
David Cole ef086b5e41 Merge topic 'qtdialog-quit'
56e0499 QtDialog: Set Ctrl+Q as the shortcut for quitting the program.
2011-12-16 10:15:39 -05:00
David Cole 1706a7ed5b Merge topic 'intel-error-regex-issue-12627'
56f29f4 CTest: Recognize Intel errors without space before colon (#12627)
2011-12-16 10:15:35 -05:00
David Cole 44b6b0b5df Merge topic 'remove-old-QtDialog-readme'
470bcfa Remove the apparently outdated README in Source/QtDialog.
2011-12-16 10:15:28 -05:00
David Cole 65db5b4a99 Merge topic 'osx-dependent-libraries'
5d99343 Do not link private dependent shared libraries on OS X > 10.4
2011-12-16 10:15:07 -05:00
David Cole 2f82798ef8 Merge topic 'transitive-shared-lib-depend'
183b950 Follow all dependencies of shared library private dependencies
2011-12-16 10:15:01 -05:00
David Cole be637d7a92 Merge topic 'fix-12441-show-custom-target-progress'
7ab1162 CMake: Fix progress reporting for custom targets (#12441)
2011-12-16 10:14:52 -05:00
David Cole 037616f194 Merge topic 'vs-version-ivar'
6571f46 Fix Intel Fortran .vfproj files for VS 10
2011-12-16 10:14:25 -05:00
David Cole 765e9d30ae Merge topic 'ctest-no-cdash-issue-12618'
52f937a CTest: Do not get CDash version without drop site (#12618)
2011-12-16 10:13:12 -05:00
David Cole f189c5d7d3 Merge topic 'xcode-rerun-issue-12616'
e8b8f0e Xcode: Create separate rerun dependencies for subprojects (#12616)
2011-12-16 10:12:36 -05:00
KWSys Robot b15071791c KWSys Nightly Date Stamp 2011-12-16 00:05:04 -05:00
Brad King c544545c63 KWSys: Correctly handle empty environment variables
Fix a crash which occurs when SystemTools::GetPath attempts to process
an empty environment variable.

Author: Vladimir Panteleev <vladimir@thecybershadow.net>
2011-12-15 15:45:09 -05:00
Raphael Kubo da Costa 56e0499104 QtDialog: Set Ctrl+Q as the shortcut for quitting the program.
QKeySequence::Quit does not work on all platforms, and since it
translates to Ctrl+Q on all platforms where it does work, Ctrl+Q was
hardcoded instead.
2011-12-15 08:51:50 -07:00
Brad King 56f29f48c2 CTest: Recognize Intel errors without space before colon (#12627)
Fix the regex meant to match errors of the form:

 C:\some\dir\source.cpp(17): catastrophic error: could not open source file "some_header.h"

to make the space between ')' and ':' optional.
2011-12-15 09:31:12 -05:00
Raphael Kubo da Costa 470bcfad7b Remove the apparently outdated README in Source/QtDialog.
Qt has been LGPL-licensed for a few years, so the clause mentioning only
developers with a paid Qt license can change the code seems to be
outdated.
2011-12-15 08:42:38 -05:00
Brad King 5d9934312d Do not link private dependent shared libraries on OS X > 10.4
The default OS X 10.4 linker incorrectly searches for dependencies of
linked shared libraries only under the -isysroot location.  It fails to
find dependencies of linked shared libraries in cases such as the
ExportImport test.  It produces errors like:

 /usr/libexec/gcc/i686-apple-darwin8/4.0.1/ld: warning can't open dynamic library:
 libtestLib3Imp.dylib
 referenced from: /.../ExportImport/Root/lib/libtestLib3lib.1.2.dylib
 (checking for undefined symbols may be affected) (No such file or directory, errno = 2)
 /usr/libexec/gcc/i686-apple-darwin8/4.0.1/ld: Undefined symbols: _testLib3Imp
 referenced from libtestLib3lib expected to be defined in
 libtestLib3Imp.dylib

or with CMAKE_SKIP_RPATH off to enable install_name in the Export side:

 /usr/libexec/gcc/i686-apple-darwin8/4.0.1/ld: warning can't open dynamic library:
 /Developer/SDKs/MacOSX10.4u.sdk/.../ExportImport/Export/impl/libtestLib3Imp.dylib
 referenced from: /.../ExportImport/Export/libtestLib3lib.1.2.dylib
 (checking for undefined symbols may be affected) (No such file or directory, errno = 2)
 /usr/libexec/gcc/i686-apple-darwin8/4.0.1/ld: Undefined symbols:_testLib3Imp
 referenced from libtestLib3lib expected to be defined in
 /.../ExportImport/Export/impl/libtestLib3Imp.dylib

Note how "/Developer/SDKs/MacOSX10.4u.sdk" is prepended to the dependent
library path.

Commit 2cff26fa (Support linking to shared libs with dependent libs,
2008-01-31) and commit 82fcaebe (Pass dependent library search path to
linker on some platforms, 2008-02-01) worked around the problem by
defining platform variable CMAKE_LINK_DEPENDENT_LIBRARY_FILES.  It tells
CMake to link to dependent libraries explicitly by their path thus
telling the linker where to find them.

Unfortunately the workaround had the side effect of linking dependent
libraries and defeats most benefits of LINK_INTERFACE_LIBRARIES.
Fortunately OS X 10.5 and above do not need to find transitive
dependencies at all so we can avoid the workaround on Modern OS X.
2011-12-15 08:14:30 -05:00
KWSys Robot 0a6543d957 KWSys Nightly Date Stamp 2011-12-15 00:05:09 -05:00
Alex Neundorf e474dcb231 automoc: improved warning message in relaxed mode
Alex
2011-12-14 19:12:15 +01:00
Brad King 183b95098e Follow all dependencies of shared library private dependencies
In cmComputeLinkDepends we compute the transitive closure of private
shared library dependencies.  When a shared library is added to this
closure we must follow all of its dependencies whether they are private
or public.  Previously we only followed the private dependencies.  Fix
the implementation to follow the public dependencies too.  Also extend
the ExportImport test to cover this case.
2011-12-14 11:33:01 -05:00
KWSys Robot 4ed1769186 KWSys Nightly Date Stamp 2011-12-14 00:05:05 -05:00
Johan Fänge 7ab1162eaa CMake: Fix progress reporting for custom targets (#12441)
Adds "include progress.make" to build.make, just like for
add_executable and add_library targets. The code was copied
from cmMakefileTargetGenerator::WriteCommonCodeRules().
2011-12-13 20:06:27 -05:00
Brad King 6571f4655a Fix Intel Fortran .vfproj files for VS 10
Commit 1be4b6f4 (Order VS local generator Version ivar values
consistently, 2011-11-10) fixed the Version ivar of the VS 10 local
generator by setting it correctly to 10 instead of leaving it at 7.
This broke generation of .vfproj files for the Intel Fortran plugin to
VS 10 by mixing VS 9 and 10 formats together in one file.  Teach the
local generator to pretend the Version is 9 for Intel Fortran targets.
2011-12-13 16:35:35 -05:00
Alex Neundorf 96fc5d5d07 automoc: default to strict mode, use CMAKE_AUTOMOC_RELAXED_MODE
automoc now defaults to strict mode, also with Qt4, i.e. it behaves as
the documentation says by default. I also inverted the switch
CMAKE_AUTOMOC_STRICT_MODE to CMAKE_AUTOMOC_RELAXED_MODE.
Docs and test adapted accordingly.

Alex
2011-12-13 22:11:47 +01:00
KWSys Robot 3c101429a4 KWSys Nightly Date Stamp 2011-12-13 00:05:03 -05:00
Valat Sébastien 52f937aea8 CTest: Do not get CDash version without drop site (#12618)
Avoid sleep for 3 seconds in ctest if CDashDropSite is empty.
2011-12-12 09:35:09 -05:00
KWSys Robot 99771d55be KWSys Nightly Date Stamp 2011-12-12 00:05:04 -05:00
KWSys Robot 53455f938b KWSys Nightly Date Stamp 2011-12-11 00:05:05 -05:00
KWSys Robot 85344d767b KWSys Nightly Date Stamp 2011-12-10 00:05:04 -05:00
Brad King e8b8f0eda8 Xcode: Create separate rerun dependencies for subprojects (#12616)
Generate the rerun dependency file for the top-level project() and each
subdirectory project() into the corresponding build directory.  Do not
clobber them all with the one for the last subproject.  This mistake was
left from when the Xcode generator did not produce subprojects.
2011-12-09 13:00:22 -05:00
KWSys Robot 33c24b2100 KWSys Nightly Date Stamp 2011-12-09 00:05:08 -05:00
KWSys Robot e61d2ded80 KWSys Nightly Date Stamp 2011-12-08 00:05:03 -05:00
David Cole d050d6b58b Merge topic 'AutomocIncludedDotMocFileHandling'
2d11951 Merge branch 'master' into AutomocIncludedDotMocFileHandling
1eca18f automoc: add documentation for CMAKE_AUTOMOC_STRICT_MODE
bc278ce automoc: fix line length
62e223e automoc: add variable CMAKE_AUTOMOC_STRICT_MODE, to enable strict parsing
40c5167 automoc: accept even more .moc files in non-strict mode
c207f5d automoc: also accept other files when .moc is included in non-strict mode
9c0df72 automoc: add a StrictParseCppFile(), which is only qmake-compatible
174bf35 automoc: move the code for finding headers into separate function
8507eae automoc: fix handling of included _p.moc files
7ada172 automoc: some more linebreaks for the warnings for better readability
3b93e26 automoc: add extra check whether the header contains Q_PRIVATE_SLOT
4745715 Add a test case for the use of Q_PRIVATE_SLOT.
bde4edb automoc: add special handling for including basename_p.moc, with test
74ab0f6 automoc: move some code from the big parsing loop into separate functions
bc7560e automoc: add test for including a moc_abc_p.cpp file
30fd8e6 automoc: add test for including the moc file from another header
...
2011-12-07 16:47:35 -05:00
David Cole 174ecf51f8 Merge topic 'refactor-versioned-lib-names'
96f65ba cmTarget: Create helper method for versioned library names
2011-12-07 16:46:35 -05:00
David Cole 2d1195123e Merge branch 'master' into AutomocIncludedDotMocFileHandling
Conflicts:
	Source/cmTarget.cxx
2011-12-07 16:29:13 -05:00
Brad King fa7141f5ad Add framework to detect compiler version with its id (#12408)
Teach CMakePlatformId.h to construct an "INFO:compiler_version[]" string
literal from macros COMPILER_VERSION_(MAJOR|MINOR|PATCH|TWEAK) to be
defined in CMake(C|CXX)CompilerId.(c|cpp) for each compiler.  Provide
conversion macros DEC() and HEX() to decode decimal or hex digits from
integer values.  Parse the version out of the compiler id binary along
with the other INFO values already present.

Store the result in variable CMAKE_<LANG>_COMPILER_VERSION in the format
"major[.minor[.patch[.tweak]]]".  Save the value persistently in
CMake(C|CXX)Compiler.cmake in the build tree.  Document the variable for
internal use since we do not set it everywhere yet.

Report the compiler version on the compiler id result line e.g.

  The C compiler identification is GNU 4.5.2

Report CMAKE_(C|CXX)_COMPILER_(ID|VERSION) in SystemInformation test.
2011-12-07 08:59:51 -05:00
KWSys Robot 6fb2a38b0a KWSys Nightly Date Stamp 2011-12-07 00:05:03 -05:00
David Cole 386cf3c593 Merge topic 'GNU-to-MS'
ae62a1c Test CMAKE_GNUtoMS option in ExportImport on MinGW and MSys
afb00fe Add CMAKE_GNUtoMS option to convert GNU .dll.a to MS .lib
61e8629 Factor makefile generator link rule lookup into helper function
a603250 Load platform files that need to know the ABI when possible
ecd8414 Fortran: Detect pointer size in gfortran on MinGW
2011-12-06 15:07:39 -05:00
David Cole 01e825332c Merge topic 'export-final-location'
fea3e84 export(): Document undefined behavior of location properties
363d396 Factor out target location undefined behavior helper macro
2011-12-06 15:05:28 -05:00
Alex Neundorf 1eca18fd52 automoc: add documentation for CMAKE_AUTOMOC_STRICT_MODE
Alex
2011-12-06 20:42:20 +01:00
Brad King 96f65ba68e cmTarget: Create helper method for versioned library names
Replace the duplicate logic for the realName and soName of versioned
shared libraries with calls to a new ComputeVersionedName method.
2011-12-06 14:19:44 -05:00
Alex Neundorf bc278ceb0f automoc: fix line length
Alex
2011-12-06 18:54:30 +01:00
KWSys Robot 759323ad0b KWSys Nightly Date Stamp 2011-12-06 00:05:06 -05:00
Brad King afb00fef19 Add CMAKE_GNUtoMS option to convert GNU .dll.a to MS .lib
Teach the Windows-GNU.cmake platform file to look for Visual Studio
tools matching the target ABI.  Add an extra step to the link command
for shared libraries and executables that export symbols and on which a
new GNUtoMS property is set (initialized by the CMAKE_GNUtoMS option).
Tell the GNU linker to output a module definition (.def) file listing
exported symbols in addition to the GNU-format import library (.dll.a).
Pass the .def file to the MS "lib" tool to construct a MS-format DLL
import library (.lib).

Teach the install(TARGETS) command to install the MS import library next
to the GNU one.  Teach the install(EXPORT) and export() command to set
the IMPORTED_IMPLIB property pointing at the import library to use the
import library matching the tools in the importing project.
2011-12-05 18:13:49 -05:00
Brad King 61e862986a Factor makefile generator link rule lookup into helper function
This provides a place in the makefile generators to adjust the link
rules for both libraries and executables.
2011-12-05 16:37:43 -05:00
Brad King a603250a13 Load platform files that need to know the ABI when possible
Load platform files named in CMAKE_<lang>_ABI_FILES for each language
once the ABI sizeof(void*) is known.  During the first configuration
this is after the test for working compiler and ABI detection checks.
During later configurations the ABI information is immediately available
because it has been saved in CMake<lang>Compiler.cmake.
2011-12-05 16:35:42 -05:00
KWSys Robot e0bc42aa4f KWSys Nightly Date Stamp 2011-12-05 00:05:05 -05:00
KWSys Robot e21e5cf289 KWSys Nightly Date Stamp 2011-12-04 00:05:11 -05:00
KWSys Robot 901e6d023f KWSys Nightly Date Stamp 2011-12-03 00:05:06 -05:00
Alex Neundorf 62e223e8fa automoc: add variable CMAKE_AUTOMOC_STRICT_MODE, to enable strict parsing
Alex
2011-12-02 22:08:06 +01:00
Alex Neundorf 40c516783e automoc: accept even more .moc files in non-strict mode
Alex
2011-12-02 21:54:11 +01:00
Alex Neundorf c207f5d361 automoc: also accept other files when .moc is included in non-strict mode
Alex
2011-12-02 21:43:15 +01:00
Alex Neundorf 9c0df72dc4 automoc: add a StrictParseCppFile(), which is only qmake-compatible
ParseCppFile() is the one which is automoc4/KDE4-compatible, and which
becomes a bit crowded. By separating these two it is easier to ensure
that the strict one doesn't get broken accidentially.

Alex
2011-12-02 20:59:44 +01:00
Alex Neundorf 174bf35fbb automoc: move the code for finding headers into separate function
Alex
2011-12-02 20:38:14 +01:00
KWSys Robot 8bda047b8e KWSys Nightly Date Stamp 2011-12-02 00:05:04 -05:00
Brad King fea3e84ee3 export(): Document undefined behavior of location properties
Since the export() command needs to know the final location of a target
in the build tree we cannot allow properties affecting the location or
name of a target file to be set after the target is passed to export().

Fix a violation of this rule in the SimpleInstall test.
2011-12-01 16:00:12 -05:00
Brad King 363d3962c4 Factor out target location undefined behavior helper macro
Move CM_LOCATION_UNDEFINED_BEHAVIOR into a dedicated header.  Add a
parameter to describe the action that leads to the undefined target
location.
2011-12-01 15:58:47 -05:00
David Cole 97142c7603 Merge topic 'newline-style'
ac2e45d Provide std::ios_base typedef on GCC < 3
28c46ca cmNewLineStyle: Use cmStandardIncludes.h
75e83e9 cmNewLineStyle: Remove trailing comma in enum
be6502c bootstrap: Include cmNewLineStyle in build
a087490 Add NEWLINE_STYLE option to configure_file (#3957)
2011-12-01 14:03:24 -05:00
David Cole f1ad054317 Merge topic 'remove-cmLocalGenerator-trailing-whitespace'
6b104e1 Remove trailing whitespace from cmLocalGenerator
2011-12-01 14:02:39 -05:00
David Cole f64d85e711 Merge topic 'vs-managed-projects'
a1f976c VS: Add support for three new project properties (#12586)
2011-12-01 14:02:32 -05:00
David Cole 9c288d6c2b Merge topic 'automoc_qt5'
a828623 moc is now part of the Qt5Core module
b8c8cab Merge remote-tracking branch 'origin/master' into automoc_qt5
2011-12-01 14:02:21 -05:00
David Cole 3f4672b1d7 Merge topic 'cmake-gui_AddCompletionForAddCacheEntry'
b0d01c3 cmake-gui: add completion for the names when adding cache entries
08c59af Remove trailing whitespace
2011-12-01 14:02:05 -05:00
KWSys Robot 0393aa61d1 KWSys Nightly Date Stamp 2011-12-01 00:05:04 -05:00
Alex Neundorf 8507eaed16 automoc: fix handling of included _p.moc files
Alex
2011-11-30 21:43:05 +01:00
Brad King ac2e45d089 Provide std::ios_base typedef on GCC < 3
The ancient GNU standard library provided std::ios but not
std::ios_base.  Define the latter in terms of the former.
2011-11-30 09:27:18 -05:00
Brad King 28c46ca6cd cmNewLineStyle: Use cmStandardIncludes.h
This ensures that stl types are compiled consistently with
the reset of CMake.  Otherwise one may get errors like

  Undefined symbol: .cmNewLineStyle::ReadFromArguments(
    const std::vector<std::_LFS_ON::basic_string ...)

due to inconsistent large file support definitions.
2011-11-30 09:19:32 -05:00
KWSys Robot 17388037fd KWSys Nightly Date Stamp 2011-11-30 00:05:04 -05:00
Alex Neundorf 7ada172002 automoc: some more linebreaks for the warnings for better readability
Alex
2011-11-29 21:07:50 +01:00
Alex Neundorf 3b93e266c0 automoc: add extra check whether the header contains Q_PRIVATE_SLOT
This is again for KDE4 compatiblity. If foo.moc is included, in general
moc should run on foo.cpp. Usually this can't cause problems.
It can only cause problems if moc must run on the header, and the resulting
file must be included in the cpp file, which is the case with the
Q_PRIVATE_SLOT macro.
This makes the test added by Stephen pass.

Alex
2011-11-29 20:55:36 +01:00
Brad King 6b104e107e Remove trailing whitespace from cmLocalGenerator 2011-11-29 08:58:45 -05:00
Brad King 75e83e98fa cmNewLineStyle: Remove trailing comma in enum 2011-11-29 08:01:07 -05:00
KWSys Robot 89f6fbaae3 KWSys Nightly Date Stamp 2011-11-29 00:05:04 -05:00
Peter Kuemmel a087490697 Add NEWLINE_STYLE option to configure_file (#3957) 2011-11-28 13:48:59 -05:00
Aaron Ten Clay a1f976ce0e VS: Add support for three new project properties (#12586)
VS_GLOBAL_PROJECT_TYPES: A string containing UUIDs to embed in the
Visual Studio project file under <ProjectTypes>.

VS_GLOBAL_KEYWORD: Allows specification of a keyword like "ManagedCProj"
instead of the default "Win32Proj", under <Keyword>

VS_DOTNET_REFERENCES: Semicolon-delimited list of .NET references to add
to the project, which creates a new <ItemGroup>.
2011-11-28 11:44:04 -05:00
KWSys Robot 912c02c682 KWSys Nightly Date Stamp 2011-11-28 00:05:05 -05:00
KWSys Robot 10c3113464 KWSys Nightly Date Stamp 2011-11-27 00:05:05 -05:00
Stephen Kelly a8286235a3 moc is now part of the Qt5Core module
There is no separate SrcTools module anymore.
2011-11-26 15:15:33 +01:00
KWSys Robot 66f44dcdf4 KWSys Nightly Date Stamp 2011-11-26 00:05:08 -05:00
KWSys Robot d63af6df7c KWSys Nightly Date Stamp 2011-11-25 00:05:06 -05:00
KWSys Robot 27e6ea9d2a KWSys Nightly Date Stamp 2011-11-24 00:05:05 -05:00
David Cole 7ed2ed9a2e Merge topic 'CheckImportedFileExistenceInConfigDotCMakeFiles'
5c03438 install(EXPORT): Improve target import failure message format
a2be068 install(EXPORT): Enforce existence of imported target files
2011-11-23 08:16:15 -05:00
David Cole 1ec3801a3a Merge topic 'target-link-libraries-interfaces'
b1f12f8 target_link_libraries: Simplify argument processing state tests
5fc95df target_link_libraries: Add missing space in documentation
9143822 target_link_libraries: Add LINK_(PUBLIC|PRIVATE) options
cf64218 target_link_libraries: Trim trailing whitespace
2011-11-23 08:16:10 -05:00
KWSys Robot 57a85237ac KWSys Nightly Date Stamp 2011-11-23 00:05:08 -05:00
Brad King b1f12f8042 target_link_libraries: Simplify argument processing state tests
Remove extra parens in test for not handling LINK_INTERFACE_LIBRARIES.
Remove redundant test for equality with ProcessingPrivateInterface
subsumed by test for inequality with ProcessingPublicInterface.
2011-11-22 17:21:36 -05:00
Brad King 5fc95dff46 target_link_libraries: Add missing space in documentation
Change "thelink" to "the link".
2011-11-22 17:19:04 -05:00
Stephen Kelly 914382224d target_link_libraries: Add LINK_(PUBLIC|PRIVATE) options
Makes it possible to specify the link dependencies and link
interfaces in one command without repetition.
2011-11-22 16:52:35 -05:00
Stephen Kelly cf64218eeb target_link_libraries: Trim trailing whitespace 2011-11-22 16:52:27 -05:00
David Cole d9df0cca66 Merge topic 'crypto-hash'
0599c5f sha2: Zero entire SHA_CTX structure during cleanup
0a6705c sha2: Suppress -Wcast-align warning from Clang
24b1feb sha2: Cast safe conversions to smaller integer types
1ec3fa0 Merge branch 'update-KWIML' into crypto-hash
6495b59 cmCryptoHash: Add virtual destructor
8302608 Fix CMake.File hash test for CRLF checkouts
9fb1a9c sha2: Wrap long lines in third-party declarations
b0853b5 Disable file() and string() hash commands during bootstrap
9da8340 sha2: Suppress Borland warnings in third-party code
23b3df7 sha2: Use KWIML fixed-size integer constant macros
2e9c26c Add string(MD5) and string(SHA*) commands to compute hashes
293a7f4 cmCryptoHash: Provide factory "New" method
46ab056 sha2: Use "static const" instead of "const static" declarations
38771d3 Add file(SHA*) commands to compute cryptographic hashes
73efd4a sha2: Build as part of CMakeLib
c1856a3 sha2: Use KWIML fixed-size integer types and endian-ness
fcc3ce5 Merge branch 'import-sha2' into crypto-hash
042f796 Add file(MD5) command to compute cryptographic hash
ed7cef5 Factor Compute(File|String)MD5 into cmCryptoHash helper
8251b20 Import sha2 implementation 1.1 from Aaron D. Gifford
9912c41 Import sha2 implementation 1.0 from Aaron D. Gifford
2011-11-22 16:24:21 -05:00
David Cole 7b1b13c8f0 Merge topic 'EclipseImprovedSourceProject'
982b766 Eclipse: use new variable CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT
1110e45 Eclipse: create links to subprojects also in the source-project (#12579)
2011-11-22 16:23:56 -05:00
David Cole f0419b439a Merge topic 'fix-11792-improve-ctest-site-handling'
92af1da CTest: Disallow problem chars in build and site names (#11792)
2011-11-22 16:23:48 -05:00
David Cole 636740c478 Merge topic 'fix-12445-add-call-for-batch-files-vs10'
46c7054 VS: Use "call " keyword with .cmd and .bat file custom commands (#12445)
2011-11-22 16:23:23 -05:00
Alex Neundorf bde4edb6ab automoc: add special handling for including basename_p.moc, with test
Alex
2011-11-22 22:01:13 +01:00
Brad King 5c03438661 install(EXPORT): Improve target import failure message format 2011-11-22 15:55:04 -05:00
Alex Neundorf a2be068c75 install(EXPORT): Enforce existence of imported target files
Typical <package>Config.cmake files for find_package() rely only on the
files generated by install(EXPORT).  They might be wrong, for whatever
reasons, like people manually deleted files, projects were packaged
wrong by distributions, whatever.  To protect against this, add checks
that the file locations we are importing actually exist on disk.

Alex
2011-11-22 15:55:00 -05:00
Alex Neundorf 74ab0f6aa4 automoc: move some code from the big parsing loop into separate functions
Alex
2011-11-22 21:35:08 +01:00
KWSys Robot 3bbe46daa2 KWSys Nightly Date Stamp 2011-11-22 00:05:06 -05:00
KWSys Robot ad9bffdc3c KWSys Nightly Date Stamp 2011-11-21 00:05:04 -05:00
KWSys Robot 6580434f16 KWSys Nightly Date Stamp 2011-11-20 00:05:04 -05:00
Alex Neundorf b0d01c306b cmake-gui: add completion for the names when adding cache entries
Up to 100 completion strings for the names of added variables
are saved in the settings, so it will remember the variables
you are usually adding.
It also ensures that CMAKE_INSTALL_PREFIX is always there, since
this is maybe the one which is set most often.

Alex
2011-11-19 22:21:41 +01:00