summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake 2.8.7-rc2David Cole2011-12-212-1/+53
|
* Merge branch 'release'David Cole2011-12-212-3/+266
|\
| * CMake 2.8.7-rc1David Cole2011-12-082-3/+266
| |
* | KWSys Nightly Date StampKWSys Robot2011-12-211-1/+1
| |
* | Merge topic 'fix-12273-quote-arg-in-findboost'David Cole2011-12-201-1/+1
|\ \ | | | | | | | | | | | | cdf5224 FindBoost: Quote possibly empty string argument (#12273)
| * | FindBoost: Quote possibly empty string argument (#12273)David Cole2011-12-191-1/+1
| | | | | | | | | | | | Author: Claudio Bley
* | | Merge topic 'AddIncludePathForASMToDirectoryInformationFile'David Cole2011-12-201-0/+2
|\ \ \ | | | | | | | | | | | | | | | | ea68837 fix #12262: dependency scanning for ASM files
| * | | fix #12262: dependency scanning for ASM filesAlex Neundorf2011-12-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now also CMAKE_ASM_INCLUDE_PATH is written into CMakeDirectoryInformation.cmake, which is necessary to make the dependency scanning for included files work. Alex
* | | | Merge topic 'AddCommentToCDependencyScanner'David Cole2011-12-201-8/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 318b0cd Add comment about one more problem of the C depency scanner. 4bb08e0 Remove trailing whitespace
| * | | | Add comment about one more problem of the C depency scanner.Alex Neundorf2011-12-181-0/+3
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Remove trailing whitespaceAlex Neundorf2011-12-181-8/+8
| |/ / / | | | | | | | | | | | | Alex
* | | | Merge topic 'qt4-deploy-module'David Cole2011-12-201-9/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3aa5432 Improve component support and output indentation.
| * | | | Improve component support and output indentation.Mike McQuaid2011-12-161-9/+13
| | | | |
* | | | | Merge topic 'avoid-mfc-test'David Cole2011-12-202-0/+65
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0e598b7 Tests: Only really run MFC test if we can build MFC apps (#11213)
| * | | | | Tests: Only really run MFC test if we can build MFC apps (#11213)David Cole2011-12-162-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | Avoid problems on "undetected" VS Express build environments.
* | | | | | Merge topic 'fix_double_project_cmake_build'David Cole2011-12-205-9/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5badf5f Fix the case where cmake --build failed with two project cmds in one file.
| * | | | | | Fix the case where cmake --build failed with two project cmds in one file.Bill Hoffman2011-12-205-9/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge topic 'AutomocFineTuning'David Cole2011-12-206-21/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e474dcb automoc: improved warning message in relaxed mode 96fc5d5 automoc: default to strict mode, use CMAKE_AUTOMOC_RELAXED_MODE
| * | | | | | | automoc: improved warning message in relaxed modeAlex Neundorf2011-12-141-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | | automoc: default to strict mode, use CMAKE_AUTOMOC_RELAXED_MODEAlex Neundorf2011-12-136-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | KWSys Nightly Date StampKWSys Robot2011-12-201-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | KWSys Nightly Date StampKWSys Robot2011-12-191-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2011-12-181-1/+1
| | | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2011-12-171-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'GNU-to-MS'David Cole2011-12-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c213eb9 Windows-GNU: Remove extra quotes in GNUtoMS rule variable
| * | | | | Windows-GNU: Remove extra quotes in GNUtoMS rule variableBrad King2011-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake replaces the <TARGET...> tokens with properly quoted values so we do not need an extra set of quotes around them.
* | | | | | Merge topic 'qtdialog-quit'David Cole2011-12-161-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56e0499 QtDialog: Set Ctrl+Q as the shortcut for quitting the program.
| * | | | | | QtDialog: Set Ctrl+Q as the shortcut for quitting the program.Raphael Kubo da Costa2011-12-151-0/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge topic 'intel-error-regex-issue-12627'David Cole2011-12-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56f29f4 CTest: Recognize Intel errors without space before colon (#12627)
| * | | | | | CTest: Recognize Intel errors without space before colon (#12627)Brad King2011-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge topic 'test-Fortran-compiler-compat'David Cole2011-12-161-10/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fcb2a27 Fix and simplify Fortran test compiler compatibility check
| * | | | | | | Fix and simplify Fortran test compiler compatibility checkBrad King2011-12-151-10/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 38aab379 (Set CMAKE_<lang>_COMPILER_ID for VS generators, 2011-09-02) the VS IDE generators set the C and C++ compiler id to MSVC and the Fortran compiler id to Intel. This caused the Fortran test to fail compatible compiler detection because the if() test "${CMAKE_C_COMPILER_ID}" MATCHES "MSVC" is evaluated as the "var MATCHES regex" signature which evaluates the compiler id "MSVC" as a variable which is defined to 1 which does not match "MSVC". Combine tests for non-identical but compatible compiler vendors into a single regex match whose left hand side will not be defined as a variable.
* | | | | | | Merge topic 'remove-old-QtDialog-readme'David Cole2011-12-161-3/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 470bcfa Remove the apparently outdated README in Source/QtDialog.
| * | | | | | | Remove the apparently outdated README in Source/QtDialog.Raphael Kubo da Costa2011-12-151-3/+0
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge topic 'test-compiler-output-var'David Cole2011-12-162-8/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f6985a Avoid clobbering variable 'OUTPUT' in compiler tests (#12628)
| * | | | | | | Avoid clobbering variable 'OUTPUT' in compiler tests (#12628)Brad King2011-12-152-8/+11
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Use an obscure name and clean up afterwards.
* | | | | | | Merge topic 'osx-dependent-libraries'David Cole2011-12-162-6/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d99343 Do not link private dependent shared libraries on OS X > 10.4
| * | | | | | | Do not link private dependent shared libraries on OS X > 10.4Brad King2011-12-152-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge topic 'transitive-shared-lib-depend'David Cole2011-12-164-3/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | 183b950 Follow all dependencies of shared library private dependencies
| * | | | | | | Follow all dependencies of shared library private dependenciesBrad King2011-12-144-3/+27
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge topic 'hp-shared-libs'David Cole2011-12-165-23/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5720e1f HP: Drive shared library linking with compiler front end
| * | | | | | | HP: Drive shared library linking with compiler front endBrad King2011-12-145-23/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we linked C, Fortran, and ASM shared libraries compiled with the HP compiler using a direct invocation of the linker (ld). This behavior was left historically from support for an ancient HP C compiler that did not know how to create shared libraries. Fortran shared libraries need to be linked with the compiler to get the language runtime library dependencies as is already done for C++. Update the HP-UX-HP* platform information to use the compiler front end when linking shared libraries. This works on modern HP tools and produces correct behavior. If there is a need to support older tools again we can add a special case for them.
* | | | | | | | 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 'fix-12480-correct-windres-compiler-when-cross-compiling'David Cole2011-12-161-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ddb1e5 Modules: Use "windres" as rc compiler base name for cross-compiles (#12480)
| * | | | | | | | Modules: Use "windres" as rc compiler base name for cross-compiles (#12480)David Cole2011-12-141-0/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...if it matches "windres", as opposed to being exactly equal to "windres" Cross-compiling windres compilers are named something like "i686-w64-mingw32-windres" (for example)
* | | | | | | | 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 'fix-lapack-issues'David Cole2011-12-161-5/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b3c42cb FindLAPACK: List thread libs to avoid link errors (#12625) f603cf2 FindLAPACK: Correct CMAKE_FIND_LIBRARY_SUFFIXES spelling (#12624)
| * | | | | | | | | FindLAPACK: List thread libs to avoid link errors (#12625)Tim Gallagher2011-12-131-1/+1
| | | | | | | | | |
generated by cgit v0.12 at 2025-01-08 04:41:55 (GMT)