summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'custom-command-refactor'Brad King2010-12-2113-144/+137
|\ | | | | | | | | | | | | | | 53ea8b3 Merge branch 'imported-target-dependencies' into custom-command-refactor 1a29cca Remove cmLocalGenerator::GetRealLocation 542b517 Factor out common custom command generator 6fe5b3d Simplify VS generator ConstructScript interface
| * Merge branch 'imported-target-dependencies' into custom-command-refactorBrad King2010-12-082-9/+49
| |\
| * | Remove cmLocalGenerator::GetRealLocationBrad King2010-12-083-24/+7
| | | | | | | | | | | | | | | | | | The cmCustomCommandGenerator::GetCommand method completely replaces the purpose of this method. Re-implement GetRealLocation inline at the only remaining call site and remove it.
| * | Factor out common custom command generatorBrad King2010-12-087-76/+119
| | | | | | | | | | | | | | | | | | The Makefile, VS, and Xcode generators previously duplicated some custom command line generation code. Factor this out into a separate class cmCustomCommandGenerator shared by all generators.
| * | Simplify VS generator ConstructScript interfaceBrad King2010-12-085-47/+14
| | | | | | | | | | | | | | | Pass to cmLocalVisualStudioGenerator::ConstructScript a cmCustomCommand instance instead of extracting arguments at all call sites.
* | | Merge topic 'ctest-git-send-committer'Brad King2010-12-213-22/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | 5992526 CTest: Factor out duplicate Git author/committer code 307b8a6 CTest git update should pass the committer as well as the author
| * | | CTest: Factor out duplicate Git author/committer codeBrad King2010-12-201-44/+28
| | | | | | | | | | | | | | | | | | | | Factor out date/time format code into FormatDateTime function instead of duplicating it.
| * | | CTest git update should pass the committer as well as the authorZach Mullen2010-12-203-0/+37
| | | |
* | | | Merge topic 'fix_docs_for_language_property'Brad King2010-12-211-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | afbfb7a Add more documentation for LANGUAGE property.
| * | | | Add more documentation for LANGUAGE property.Bill Hoffman2010-12-201-1/+3
| |/ / / | | | | | | | | | | | | Make it clear that if you set the language on a file, it will be compiled.
* | | | Merge topic 'vs2010_header_only_fix'Brad King2010-12-213-2/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f578381 Fix vs2010 project generation error when HEADER_FILE_ONLY is set.
| * | | | Fix vs2010 project generation error when HEADER_FILE_ONLY is set.Bill Hoffman2010-12-203-2/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | In vs2010 a bad project file could be generated if a .c or .cxx file was marked with HEADER_FILE_ONLY, if it was in a library that contained both c and c++ code. This fixes the error in the code, and adds a test for this case.
* | | | Merge topic 'vs10-sln-msbuild-workaround'Brad King2010-12-213-10/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e1442ac Avoid msbuild ".\" idiosyncrasy that builds multiple configs (#11594) 42a2e9d Revert "Avoid msbuild idiosyncrasy that builds multiple configs" (#11633) 2c2eee6 Revert "Remove unused parameter "root" in some VS generator methods"
| * | | | Avoid msbuild ".\" idiosyncrasy that builds multiple configs (#11594)Brad King2010-12-202-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a .sln file refers to a project file with a leading ".\", as in ".\foo.vcxproj" instead of just "foo.vcxproj" or a full path then msbuild behaves strangely. Whenever target foo is built as a dependency of another target, msbuild brings multiple configurations up to date instead of just the requested configuration! Avoid a leading ".\" in project file references to avoid this behavior. This alternative fix to that attempted by commit 57e71533 (Avoid msbuild idiosyncrasy that builds multiple configs, 2010-12-10) avoids use of full path project file references which vcbuild does not support.
| * | | | Revert "Avoid msbuild idiosyncrasy that builds multiple configs" (#11633)Brad King2010-12-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 57e71533f45601275afd7787d763664f9e6b9536. While "msbuild" can handle full paths to project files in solutions, the old "vcbuild" used for VS < 10 cannot. We will need another way to fix issue #11594.
| * | | | Revert "Remove unused parameter "root" in some VS generator methods"Brad King2010-12-203-2/+4
| | | | | | | | | | | | | | | | | | | | This reverts commit 10f01ae962feb68177f7bd698b01bbc18668920c.
* | | | | Merge topic 'always_enable_generate'Brad King2010-12-214-51/+146
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3f158c6 cmake-gui: always enable generate button.
| * | | | | cmake-gui: always enable generate button.Clinton Stimpson2010-12-184-51/+146
| | | | | |
* | | | | | Merge topic 'fix-11487-multiple-test-calls'Brad King2010-12-211-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 744366f CTest: multiple ctest_test calls w/LABEL regexs (#11487)
| * | | | | | CTest: multiple ctest_test calls w/LABEL regexs (#11487)Clinton Stimpson2010-12-171-0/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | The Initialize method was not re-initializing everything that it should have been. This commit fixes that.
* | | | | | Merge topic 'fix-10587-avoid-try-compile-warnings'Brad King2010-12-211-8/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 984acc8 VS10: avoid warning, no nologo when verbose (#10587)
| * | | | | | VS10: avoid warning, no nologo when verbose (#10587)David Cole2010-12-171-8/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For prior versions of Visual Studio we would intentionally pass "/nologo-" for "verbose makefiles" (CMAKE_VERBOSE_MAKEFILE ON) when the caller did not already explicitly specify either /nologo or /nologo-. And we still do. For the prior versions. This had the side effect of always passing /nologo- for try_compile operations because try_compile generates projects that have verbose makefiles on. However, starting with Visual Studio 10, the compiler emits "cl ... warning D9035: option 'nologo-' has been deprecated" when passed "/nologo-". Therefore, this commit removes setting "/nologo-" for verbose makefiles in the Visual Studio 10 case to avoid emitting a warning for every single invocation of the compiler in a given build. With Visual Studio 10, we do not set this flag either way and therefore, the generated project has no value for this setting and gets Visual Studio's default value, which is of course "/nologo", which does not produce a warning. With Visual Studio 10, a caller can still force "/nologo-" if desired by adding it explicitly to CMAKE_C_FLAGS or CMAKE_CXX_FLAGS.
* | | | | | Merge topic 'fix-8210-find-makensis-in-path'Brad King2010-12-211-9/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd9aa73 CPack: look for makensis in the PATH (#8210)
| * | | | | | CPack: look for makensis in the PATH (#8210)David Cole2010-12-171-9/+23
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we would search in the Windows registry for the path to makensis, and fail immediately if we could not read the registry value, assuming that it was simply not installed. This change looks for makensis in the PATH even if the registry value is not there, enabling the scenario where makensis is installed without admin privileges and never even touches HKEY_LOCAL_MACHINE during the non-admin install.
* | | | | | Merge topic 'dev/fix-cmcurl-try_run'Brad King2010-12-214-66/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e0b001 Fix missed _POLL_EMUL_H_ and HAVE_POLL combo 8a61950 Toss out strerror_r macros 44fca8b Check for poll when looking for _POLL_EMUL_H_ 8d36890 Use _POLL_EMUL_H_ instead of HAVE_POLL_FINE c5cbb31 Ignore strerror_r since CMake isn't threaded
| * | | | | | Fix missed _POLL_EMUL_H_ and HAVE_POLL comboBen Boeckel2010-12-171-1/+1
| | | | | | |
| * | | | | | Toss out strerror_r macrosBen Boeckel2010-12-171-9/+0
| | | | | | |
| * | | | | | Check for poll when looking for _POLL_EMUL_H_Ben Boeckel2010-12-171-2/+2
| | | | | | |
| * | | | | | Use _POLL_EMUL_H_ instead of HAVE_POLL_FINEBen Boeckel2010-12-163-14/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Headers define _POLL_EMUL_H_ if they are not in the kernel, so a try_run check for them is not necessary.
| * | | | | | Ignore strerror_r since CMake isn't threadedBen Boeckel2010-12-161-43/+0
| | | | | | |
* | | | | | | Merge topic 'fix-11533-vs10-custom-build-err'Brad King2010-12-214-1/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 66e7917 VS10: stop build on custom command error (#11533)
| * | | | | | | VS10: stop build on custom command error (#11533)David Cole2010-12-174-1/+30
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In VS9 and previous versions, :VCReportError is the goto label to jump to after a failed custom command. It stops the build before it tries to go any further. In VS10, :VCEnd is the correct label to use. Create a method in the VS generators to provide the correct line of script to use for each version of Visual Studio. For more internal details, search for VCEnd in the C:\Program Files\MSBuild directory.
* | | | | | | Merge topic 'xcode-version-3.2'Brad King2010-12-211-2/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7d525e Xcode: Generate native 3.2 projects
| * | | | | | | Xcode: Generate native 3.2 projectsBrad King2010-12-171-2/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set objectVersion = 46; compatibilityVersion = "Xcode 3.2" when Xcode 3.2 is detected.
* | | | | | | Merge topic 'remove-GetMaximumFilePathLength-call'Brad King2010-12-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b97760f Remove call to SystemTools::GetMaximumFilePathLength
| * | | | | | | Remove call to SystemTools::GetMaximumFilePathLengthBrad King2010-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The KWSys SystemTools::GetMaximumFilePathLength method is poorly conceived and should not be used. The cmDepends code honors its own MaxPath buffer size. Just hard-code it.
* | | | | | | | Merge topic 'file-GLOB-use-case-warning'Brad King2010-12-211-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26cc29a Warn in find(GLOB) docs about bad use case (#11617)
| * | | | | | | | Warn in find(GLOB) docs about bad use case (#11617)Brad King2010-12-161-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first instinct of a lot of users is to use file(GLOB) to assemble lists of sources. Add a warning to the help text stating that it should not be used for this purpose and briefly explain why. Suggested-By: Ryan Pavlik
* | | | | | | | | Merge topic 'CheckCCompilerFlag-strict-prototypes'Brad King2010-12-212-1/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b3efdb5 CheckCCompilerFlag: Strict signature of 'main' (#11615)
| * | | | | | | | | CheckCCompilerFlag: Strict signature of 'main' (#11615)Brad King2010-12-162-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use "int main(void)" instead of just "int main()" so that compiling with "gcc -Werror=strict-prototypes" works. Test this check using the flags "-Werror -Wstrict-prototypes" to work with old GCC versions.
* | | | | | | | | | Merge topic 'gnu-compiler-windows-info'Brad King2010-12-211-1/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8d380f Remove unused old-style g++ info file
| * | | | | | | | | | Remove unused old-style g++ info fileBrad King2010-12-161-1/+0
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit aff31479 (Modernize GNU compiler info on Windows, 2009-12-02) the file Modules/Platform/Windows-g++.cmake has been unused. It just includes the non-existent Modules/Platform/Windows-gcc.cmake so remove it outright.
* | | | | | | | | | Merge topic 'intel-compiler-windows-info'Brad King2010-12-219-189/+118
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd43636 Modernize Intel compiler info on Windows 58c73c4 Detect Fortran target architecture on Windows
| * | | | | | | | | | Modernize Intel compiler info on WindowsBrad King2010-12-166-192/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves Intel compiler info on Windows into new-style modules Platform/Windows-Intel-<lang>.cmake using language-independent helper module Platform/Windows-Intel.cmake to define macros consolidating the information.
| * | | | | | | | | | Detect Fortran target architecture on WindowsBrad King2010-12-164-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 4430bccc (Change the way 32/64 bit compiles are detected with MSVC and intel, 2009-11-19) added detection of the target processor to C and CXX language builds with MS and Intel tools. Do the same for Intel Fortran for Windows (ifort). Use /machine:<arch> to link executables.
* | | | | | | | | | | Merge topic 'intel-config-definitions'Brad King2010-12-211-10/+10
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3fb088e Make Intel defines consistent with MSVC on Windows (#9904)
| * | | | | | | | | | Make Intel defines consistent with MSVC on Windows (#9904)Brad King2010-12-151-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add /DWIN32 and /D_WINDOWS to default config-independent flags. Add /D[_N]DEBUG to default flags for each configuration.
* | | | | | | | | | | Merge topic 'ctest-depend-cycle'Brad King2010-12-213-16/+34
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f7133c CTest: Fix line-too-long style in DEPEND cycle error f48d3bc CTest: Fix test DEPEND cycle detection
| * | | | | | | | | | | CTest: Fix line-too-long style in DEPEND cycle errorBrad King2010-12-161-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | CTest: Fix test DEPEND cycle detectionBrad King2010-12-153-16/+34
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A cycle exists when the DFS returns to the root node, not just when multiple paths lead to the same node. Inspired-By: Alexander Esilevich <aesilevich@pathscale.com>