summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into AutomocIncludedDotMocFileHandlingDavid Cole2011-12-07201-567/+7588
|\ | | | | | | | | Conflicts: Source/cmTarget.cxx
| * Merge topic 'topics/FindCUDA/Quote-fixes'David Cole2011-12-062-21/+21
| |\ | | | | | | | | | | | | c3c7a0c Fixes for handling quotes in args and other places (Fix Bug 11726 and 12099).
| | * Fixes for handling quotes in args and other places (Fix Bug 11726 and 12099).James Bigler2011-12-062-21/+21
| | |
| * | Merge topic 'topics/FindCUDA/FixCUDAInUNCPath'David Cole2011-12-061-2/+16
| |\ \ | | | | | | | | | | | | | | | | 83d4eea Add work around for CUDA in UNC paths.
| | * | Add work around for CUDA in UNC paths.James Bigler2011-12-051-2/+16
| | |/ | | | | | | | | | | | | | | | Nvcc can emit '/path' instead of '//path' which can cause a lot of grief later. We test to see if the file exists, if it doesn't then we see if the file exists with '/' prepended. Files that don't exist won't be added to the list.
| * | Merge topic 'topics/FindCUDA/linux-double-build'David Cole2011-12-061-0/+2
| |\ \ | | | | | | | | | | | | | | | | aa59544 Reset dependency file list when a dependency disappeared.
| | * | Reset dependency file list when a dependency disappeared.James Bigler2011-12-051-0/+2
| | |/ | | | | | | | | | | | | | | | Fix a long outstanding bug when a file in the dependency list wasn't found. This bug wouldn't reset the dependencies, so the makefile would still want the missing file when building. The work around was to configure twice, but this is no longer necessary.
| * | Merge topic 'GNU-to-MS'David Cole2011-12-0627-5/+242
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Test CMAKE_GNUtoMS option in ExportImport on MinGW and MSysBrad King2011-12-052-0/+6
| | | |
| | * | Add CMAKE_GNUtoMS option to convert GNU .dll.a to MS .libBrad King2011-12-0515-2/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-057-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Fortran: Detect pointer size in gfortran on MinGWBrad King2011-12-053-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Use __SIZEOF_POINTER__ which the GNU Fortran compiler defines at least on 64-bit MinGW. Assume default size 4 on MinGW if gfortran does not define the size.
| * | | Merge topic 'CUDAv3.2PathChanges'David Cole2011-12-061-11/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | 8930938 Added support for CUDA_PATH which is present in the CUDA toolkit 3.2 onward.
| | * | | Added support for CUDA_PATH which is present in the CUDA toolkit 3.2 onward.James Bigler2011-12-051-11/+14
| | | |/ | | |/| | | | | | | | | | | | | This required changing how the paths were used. I now use the PATH_SUFFIXES parameter instead of putting the whole path in the command.
| * | | Merge topic 'fix-ExternalProject-svn-issue'David Cole2011-12-061-7/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | f529ddc Tests: ExternalProject: Remove unnecessary 'svn --version' call
| | * | | Tests: ExternalProject: Remove unnecessary 'svn --version' callRolf Eike Beer2011-12-051-7/+0
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test will fail to get a proper version number if running on a (e.g. German) localized system because the regular expression used to match the Subversion version output does not match. Instead of duplicating code just remove the local test altogether and use the version that FindSubversion.cmake already detects.
| * | | Merge topic 'findlapack-0012477-new'David Cole2011-12-061-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | f44f053 FindLAPACK: Fix linking to static LAPACK on Unix (#12477)
| | * | | FindLAPACK: Fix linking to static LAPACK on Unix (#12477)Alexey Ozeritsky2011-12-051-1/+1
| | | | |
| * | | | Merge topic 'TinyCC-compiler'David Cole2011-12-063-0/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0efe602 TinyCC: Add default compilation flags (#12605) ec636e2 TinyCC: Add compiler info for shared libs on Linux (#12605) 1f49d72 Recognize the Tiny C Compiler (#12605)
| | * | | | TinyCC: Add default compilation flags (#12605)Mathieu Malaterre2011-12-051-0/+7
| | | | | |
| | * | | | TinyCC: Add compiler info for shared libs on Linux (#12605)Brad King2011-12-022-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the "-shared" option to link shared libraries. The compiler does not support "-Wl," or "-rpath" but does know how to pass "-soname" through to the linker.
| | * | | | Recognize the Tiny C Compiler (#12605)Brad King2011-12-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See compiler home page here: http://tinycc.org/ http://bellard.org/tcc/ Use the id "TinyCC" as it appears in their online documentation.
| * | | | | Merge topic 'qt4-macros-verbatim'David Cole2011-12-061-9/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b07c19 Fix path quoting in Qt4 macros
| | * | | | | Fix path quoting in Qt4 macrosPierre-Francois Laquerre2011-12-041-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding VERBATIM to the ADD_CUSTOM_COMMAND calls in the qt4 macros ensures that paths are properly quoted when passed to the shell. This fixes issues when building projects that contained paths with special characters (according to /bin/sh), such as parentheses or spaces.
| * | | | | | Merge topic 'export-final-location'David Cole2011-12-066-21/+42
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-013-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |_|_|_|/ / | |/| | | | |
| * | | | | | KWSys Nightly Date StampKWSys Robot2011-12-051-1/+1
| | | | | | |
| * | | | | | KWSys Nightly Date StampKWSys Robot2011-12-041-1/+1
| | |/ / / / | |/| | | |
| * | | | | KWSys Nightly Date StampKWSys Robot2011-12-031-1/+1
| | |/ / / | |/| | |
| * | | | KWSys Nightly Date StampKWSys Robot2011-12-021-1/+1
| |/ / /
| * | | Merge topic 'FindZLIB-use-ZLIB_ROOT'David Cole2011-12-011-10/+25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | 985dee4 FindZLIB: Search under ZLIB_ROOT if it is set
| | * | | FindZLIB: Search under ZLIB_ROOT if it is setBrad King2011-11-301-10/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perform multiple separate searches in order. If ZLIB_ROOT is set search it exclusively so it takes precedence over CMAKE_PREFIX_PATH. This allows a user to provide -DZLIB_ROOT=/path/to/zlib/prefix on the CMake command line to tell it exactly where to find zlib. Otherwise fall back to a normal search. Inspired-by: Andreas Schneider <asn@cryptomilk.org>
| * | | | Merge topic 'newline-style'David Cole2011-12-0114-7/+229
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * | | | Provide std::ios_base typedef on GCC < 3Brad King2011-11-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ancient GNU standard library provided std::ios but not std::ios_base. Define the latter in terms of the former.
| | * | | | cmNewLineStyle: Use cmStandardIncludes.hBrad King2011-11-301-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | cmNewLineStyle: Remove trailing comma in enumBrad King2011-11-291-1/+1
| | | | | |
| | * | | | bootstrap: Include cmNewLineStyle in buildBrad King2011-11-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The cmNewLineStyle class is needed by cmMakefile.
| | * | | | Add NEWLINE_STYLE option to configure_file (#3957)Peter Kuemmel2011-11-2812-7/+225
| | | | | |
| * | | | | Merge topic 'useqt4-fix-declarative'David Cole2011-12-011-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3cd08ce Qt4: Fix dependencies of QtDeclartive.
| | * | | | | Qt4: Fix dependencies of QtDeclartive.Clinton Stimpson2011-11-291-3/+3
| | | |_|_|/ | | |/| | |
| * | | | | Merge topic 'remove-cmLocalGenerator-trailing-whitespace'David Cole2011-12-011-73/+73
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b104e1 Remove trailing whitespace from cmLocalGenerator
| | * | | | | Remove trailing whitespace from cmLocalGeneratorBrad King2011-11-291-73/+73
| | | | | | |
| * | | | | | Merge topic 'vs-managed-projects'David Cole2011-12-013-1/+80
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1f976c VS: Add support for three new project properties (#12586)
| | * | | | | | VS: Add support for three new project properties (#12586)Aaron Ten Clay2011-11-283-1/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>.
| * | | | | | | Merge topic 'automoc_qt5'David Cole2011-12-012-4/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a828623 moc is now part of the Qt5Core module b8c8cab Merge remote-tracking branch 'origin/master' into automoc_qt5
| | * | | | | | | moc is now part of the Qt5Core moduleStephen Kelly2011-11-262-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no separate SrcTools module anymore.
| | * | | | | | | Merge remote-tracking branch 'origin/master' into automoc_qt5Stephen Kelly2011-11-1028-86/+347
| | |\ \ \ \ \ \ \