summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-12441-show-custom-target-progress'David Cole2011-12-161-0/+14
|\ | | | | | | | | 7ab1162 CMake: Fix progress reporting for custom targets (#12441)
| * CMake: Fix progress reporting for custom targets (#12441)Johan Fänge2011-12-141-0/+14
| | | | | | | | | | | | Adds "include progress.make" to build.make, just like for add_executable and add_library targets. The code was copied from cmMakefileTargetGenerator::WriteCommonCodeRules().
* | Merge topic 'vs-version-ivar'David Cole2011-12-161-0/+10
|\ \ | | | | | | | | | | | | 6571f46 Fix Intel Fortran .vfproj files for VS 10
| * | Fix Intel Fortran .vfproj files for VS 10Brad King2011-12-131-0/+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.
* | | Merge topic 'ctest-no-cdash-issue-12618'David Cole2011-12-161-2/+6
|\ \ \ | | | | | | | | | | | | | | | | 52f937a CTest: Do not get CDash version without drop site (#12618)
| * | | CTest: Do not get CDash version without drop site (#12618)Valat Sébastien2011-12-121-2/+6
| | | | | | | | | | | | | | | | Avoid sleep for 3 seconds in ctest if CDashDropSite is empty.
* | | | Merge topic 'xcode-rerun-issue-12616'David Cole2011-12-161-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e8b8f0e Xcode: Create separate rerun dependencies for subprojects (#12616)
| * | | | Xcode: Create separate rerun dependencies for subprojects (#12616)Brad King2011-12-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | KWSys Nightly Date StampKWSys Robot2011-12-161-1/+1
| | | | |
* | | | | KWSys: Correctly handle empty environment variablesBrad King2011-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a crash which occurs when SystemTools::GetPath attempts to process an empty environment variable. Author: Vladimir Panteleev <vladimir@thecybershadow.net>
* | | | | KWSys Nightly Date StampKWSys Robot2011-12-151-1/+1
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2011-12-141-1/+1
| |_|_|/ |/| | |
* | | | KWSys Nightly Date StampKWSys Robot2011-12-131-1/+1
| |/ / |/| |
* | | KWSys Nightly Date StampKWSys Robot2011-12-121-1/+1
| | |
* | | KWSys Nightly Date StampKWSys Robot2011-12-111-1/+1
| | |
* | | KWSys Nightly Date StampKWSys Robot2011-12-101-1/+1
| | |
* | | KWSys Nightly Date StampKWSys Robot2011-12-091-1/+1
|/ /
* | KWSys Nightly Date StampKWSys Robot2011-12-081-1/+1
| |
* | Merge topic 'AutomocIncludedDotMocFileHandling'David Cole2011-12-074-72/+355
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * \ Merge branch 'master' into AutomocIncludedDotMocFileHandlingDavid Cole2011-12-0774-428/+3250
| |\ \ | | | | | | | | | | | | | | | | Conflicts: Source/cmTarget.cxx
| * | | automoc: add documentation for CMAKE_AUTOMOC_STRICT_MODEAlex Neundorf2011-12-062-1/+18
| | | | | | | | | | | | | | | | Alex
| * | | automoc: fix line lengthAlex Neundorf2011-12-061-1/+1
| | | | | | | | | | | | | | | | Alex
| * | | automoc: add variable CMAKE_AUTOMOC_STRICT_MODE, to enable strict parsingAlex Neundorf2011-12-022-2/+12
| | | | | | | | | | | | | | | | Alex
| * | | automoc: accept even more .moc files in non-strict modeAlex Neundorf2011-12-021-56/+25
| | | | | | | | | | | | | | | | Alex
| * | | automoc: also accept other files when .moc is included in non-strict modeAlex Neundorf2011-12-021-20/+14
| | | | | | | | | | | | | | | | Alex
| * | | automoc: add a StrictParseCppFile(), which is only qmake-compatibleAlex Neundorf2011-12-022-6/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | automoc: move the code for finding headers into separate functionAlex Neundorf2011-12-022-21/+37
| | | | | | | | | | | | | | | | Alex
| * | | automoc: fix handling of included _p.moc filesAlex Neundorf2011-11-301-2/+3
| | | | | | | | | | | | | | | | Alex
| * | | automoc: some more linebreaks for the warnings for better readabilityAlex Neundorf2011-11-291-8/+8
| | | | | | | | | | | | | | | | Alex
| * | | automoc: add extra check whether the header contains Q_PRIVATE_SLOTAlex Neundorf2011-11-291-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | automoc: add special handling for including basename_p.moc, with testAlex Neundorf2011-11-221-7/+32
| | | | | | | | | | | | | | | | Alex
| * | | automoc: move some code from the big parsing loop into separate functionsAlex Neundorf2011-11-221-30/+47
| | | | | | | | | | | | | | | | Alex
| * | | Automoc: modified handling of included .moc filesAlex Neundorf2011-11-161-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -enable the KDE4-compatiblity mode only when using Qt4 -always (except in the KDE4 compat mode) error out if a cpp-file contains "Q_OBJECT", but does not include filename.moc Alex
| * | | automoc: another runtime optimizationAlex Neundorf2011-11-101-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | before doing the full regexp, try a simple strstr(), if this already fails, no need to do the regexp matching. Alex
| * | | automoc: minor optimizationAlex Neundorf2011-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handing th std::string instead the char* to the find() reduces the time from 17 to 15 seconds (for a 1000 times loop of a relatively small file), which is around 10 percent. Alex
| * | | automoc: improved diagnosticsAlex Neundorf2011-11-101-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Error/warning messages now look like: AUTOMOC: (error|warning): <filename>: the actual text... Alex
| * | | automoc: handle the case when the developer includes the wrong mocfileAlex Neundorf2011-11-101-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are multiple/many places in KDE where the developer includes moc_foo.cpp, and expects moc to run on foo.cpp, instead of foo.h. He should use foo.moc, but right now this is handled by automoc4, so we must stay compatible. So support this too, but warn about it. Alex
| * | | automoc: rework the checking for the matching header, to give better warningsAlex Neundorf2011-11-101-42/+35
| | | | | | | | | | | | | | | | Alex
| * | | automoc: stricter checking for what file is includedAlex Neundorf2011-11-101-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | foo.cpp must include foo.moc to have itself processed by moc Alex
* | | | Merge topic 'refactor-versioned-lib-names'David Cole2011-12-072-40/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 96f65ba cmTarget: Create helper method for versioned library names
| * | | | cmTarget: Create helper method for versioned library namesBrad King2011-12-062-40/+37
| | | | | | | | | | | | | | | | | | | | | | | | | Replace the duplicate logic for the realName and soName of versioned shared libraries with calls to a new ComputeVersionedName method.
* | | | | KWSys Nightly Date StampKWSys Robot2011-12-071-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'GNU-to-MS'David Cole2011-12-069-5/+119
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Add CMAKE_GNUtoMS option to convert GNU .dll.a to MS .libBrad King2011-12-058-2/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Factor makefile generator link rule lookup into helper functionBrad King2011-12-054-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | This provides a place in the makefile generators to adjust the link rules for both libraries and executables.
| * | | | Load platform files that need to know the ABI when possibleBrad King2011-12-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge topic 'export-final-location'David Cole2011-12-064-11/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fea3e84 export(): Document undefined behavior of location properties 363d396 Factor out target location undefined behavior helper macro
| * | | | | export(): Document undefined behavior of location propertiesBrad King2011-12-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Factor out target location undefined behavior helper macroBrad King2011-12-013-11/+28
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Move CM_LOCATION_UNDEFINED_BEHAVIOR into a dedicated header. Add a parameter to describe the action that leads to the undefined target location.
* | | | | KWSys Nightly Date StampKWSys Robot2011-12-061-1/+1
| | | | |
generated by cgit v0.12 at 2025-02-10 07:05:35 (GMT)