summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* libarchive: Add .gitattributes for indentation with tabBrad King2011-12-221-0/+2
|
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2011-12-20164-0/+100292
|\ | | | | | | | | Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950 snapshot.
| * libarchive 3.0.1-r3950 (reduced)LibArchive Upstream2011-12-20164-0/+100292
| | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream libarchive using the following shell code. url=https://libarchive.googlecode.com/svn/trunk v=3.0.1 r=3950 paths=" CMakeLists.txt COPYING CTestConfig.cmake build/cmake build/pkgconfig build/utils build/version libarchive/*.* " date=$(svn log -q -c$r $url | sed -n "/^r/ {s/[^|]*|[^|]*|//;p;}") svn export -r$r $url libarchive-$v-r$r && mkdir libarchive-$v-r$r-reduced && (cd libarchive-$v-r$r && tar c $paths) | (cd libarchive-$v-r$r-reduced && tar x) echo "r$r date: $date"
* libarchive: Remove our copy to make room for new importBrad King2011-12-20369-125904/+1
|
* 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
| | | | | | | |
| * | | | | | | FindLAPACK: Correct CMAKE_FIND_LIBRARY_SUFFIXES spelling (#12624)Tim Gallagher2011-12-131-4/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'qt4-deploy-module'David Cole2011-12-161-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4e9274e Unset configurations variable when no build type.
| * | | | | | | Unset configurations variable when no build type.Mike McQuaid2011-12-131-0/+2
| | | | | | | |
* | | | | | | | Merge topic 'CPackRPM-0012608-UserSpecificFileControl'David Cole2011-12-161-10/+89
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 121c295 CPackRPM fix #0012608 and unoticed related bug
| * | | | | | | | CPackRPM fix #0012608 and unoticed related bugEric NOULARD2011-12-121-10/+89
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The User may now specific a list of file that shouldn't be automatically handled by CPack but specified by the user. Like %config(noreplace) or specific %attr. The concerned files/dir lines will be removed from the set automatically handled by CPack.
* | | | | | | | 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.
* | | | | | | | | | Merge topic 'FortranCInterface-MinGW'David Cole2011-12-161-0/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4cb73c4 FortranCInterface: Work around mingw32-make trouble with parens
| * | | | | | | | | | FortranCInterface: Work around mingw32-make trouble with parensBrad King2011-12-091-0/+8
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mingw32-make tool does not handle parenthesis in the path to a source file consistently. When CMake is installed in a typical location like "c:\Program Files (x86)\CMake 2.8\" the mingw32-make tool fails on the FortranCInterface detection project sometimes with errors like >mingw32-make -f CMakeFiles\myfort.dir\build.make CMakeFiles/myfort.dir/my_module.f90.obj mingw32-make: *** No rule to make target `x86)/CMake 2.8/share/cmake-2.8/Modules/FortranCInterface/my_module.f90)', needed by `CMakeFiles/myfort.dir/my_module.f90.obj'. Stop. due to parens in the path to the FortranCInterface source directory. However, the behavior varies with the file name of build.make: >copy CMakeFiles\myfort.dir\build.make CMakeFiles\myfort.dir\build2.make >mingw32-make -f CMakeFiles\myfort.dir\build2.make CMakeFiles/myfort.dir/my_module.f90.obj [ 3%] Building Fortran object CMakeFiles/myfort.dir/my_module.f90.obj Tested with >mingw32-make -v GNU Make 3.82 Built for i386-pc-mingw32 Work around the problem by copying the whole FortranCInterface source directory in to the project build tree.
* | | | | | | | | | Merge topic 'update-cygwin-release-script'David Cole2011-12-161-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61a7da2 Release: Increase timeout for slow-testing cygwin build
| * | | | | | | | | | Release: Increase timeout for slow-testing cygwin buildDavid Cole2011-12-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the ExternalProject test was timing out at the default timeout value of 1500 seconds. Give it time, little one, it will finish if you learn patience.
* | | | | | | | | | | 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
| |_|_|_|_|_|_|/ / |/| | | | | | | |
generated by cgit v0.12 at 2024-09-21 12:51:42 (GMT)