summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fixSymlinkInZIP'David Cole2012-01-171-3/+7
|\ | | | | | | | | 768cf91 Do not add the content of a file if it's a symlink.
| * Do not add the content of a file if it's a symlink.Eric NOULARD2012-01-131-3/+7
| | | | | | | | | | | | | | This wasn't necessary for TAR-like (TGZ, TBZ2, etc...) archive because for those the size was 0. Either there is an error in upstream libarchive concerning the size or we should not rely on size of the entry for adding content.
* | Merge topic 'ExternalProject-git-cmd-version'David Cole2012-01-171-1/+2
|\ \ | | | | | | | | | | | | | | | 4ac6ba2 ExternalProject: Update copyright year 8cb8ccc ExternalProject: Fix git.cmd version detection
| * | ExternalProject: Update copyright yearBrad King2012-01-101-1/+1
| | |
| * | ExternalProject: Fix git.cmd version detectionBrad King2012-01-101-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When GIT_EXECUTABLE points at ".../Git/cmd/git.cmd" in an msysGit installation we previously failed to detect the version number in a subtle case. The "git.cmd" assumes 'chcp' is in PATH. It is typically available at "C:\Windows\System32\chcp.com". On 64-bit Windows the File System Redirector maps this location to "C:\Windows\SysWOW64\chcp.com" for 32-bit processes. However, some Windows installations fail to provide chcp.com at this path. Whenever git.cmd runs in a 32-bit command shell, as it does under a 32-bit CMake binary, it reports 'chcp' is not recognized as an internal or external command, operable program or batch file. on stderr. Capture stderr separately so it does not affect parsing of the version number. See also msysGit issue 358: http://code.google.com/p/msysgit/issues/detail?id=358 Note that FindGit prefers "git.cmd" over "git.exe" because it sets up the proper HOME environment variable necessary for Git ssh connections to work the same as they do from the Git bash prompt.
* | Merge topic 'compiler-version'David Cole2012-01-178-8/+237
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0df1942 Detect SGI MIPSpro compiler version with its id a5e892c Document compiler version macro formats used for detection d7c6f41 Detect HP compiler version with its id 3dd9fa9 Detect SunPro compiler version with its id c198730 Detect Watcom compiler version with its id 5899b98 Detect Clang compiler version with its id b8cfa65 Detect PGI compiler version with its id 6dae666 Detect IBM XL compiler version with its id 4080d55 Detect Borland compiler version with its id 2cc205a Detect Intel compiler version with its id (#11937) a6d83cc Detect MSVC compiler version with its id a662855 Detect GNU compiler version with its id (#6251) fa7141f Add framework to detect compiler version with its id (#12408)
| * | Detect SGI MIPSpro compiler version with its idBrad King2012-01-102-0/+22
| | | | | | | | | | | | | | | | | | | | | Decode decimal digits from _SGI_COMPILER_VERSION or _COMPILER_VERSION to compute version number components. See documentation at: http://predef.sourceforge.net/precomp.html
| * | Document compiler version macro formats used for detectionBrad King2012-01-102-0/+28
| | | | | | | | | | | | | | | | | | The MSVC, HP, XL, SunPro, Watcom, Borland, and Intel compilers specify their version number in components encoded in a single integer value. Document the components that we use to compute version numbers.
| * | Detect HP compiler version with its idBrad King2012-01-102-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Decode decimal digits from __HP_cc and __HP_aCC to compute version number components. See documentation at: http://predef.sourceforge.net/precomp.html http://g4u0420c.houston.hp.com/en/14487/preprocess.htm
| * | Detect SunPro compiler version with its idBrad King2012-01-102-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decode hex digits from __SUNPRO_C and __SUNPRO_CC to compute the version number components. Note that the constant encodes decimal digits as hex digits (never larger than 9). We represent them as decimal after extraction. See documentation at http://predef.sourceforge.net/precomp.html Although the documented version number format is 0xVRP where V = Version, R = Revision, P = Patch it holds only though SunPro C/C++ version 5.9. Later versions have a two-digit revision (minor) number so their format is 0xVRRP.
| * | Detect Watcom compiler version with its idBrad King2011-12-072-0/+4
| | | | | | | | | | | | | | | | | | | | | Decode decimal digits from __WATCOMC__ to compute the version number components. See documentation at: http://predef.sourceforge.net/precomp.html
| * | Detect Clang compiler version with its idBrad King2011-12-072-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decode decimal digits from __clang_major__ __clang_minor__ __clang_patchlevel__ to compute version number components. See documentation at: http://clang.llvm.org/docs/LanguageExtensions.html#builtinmacros http://predef.sourceforge.net/precomp.html
| * | Detect PGI compiler version with its idBrad King2011-12-072-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decode decimal digits from __PGIC__ __PGIC_MINOR__ __PGIC_PATCHLEVEL__ to compute version number components.
| * | Detect IBM XL compiler version with its idBrad King2011-12-072-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Decode decimal digits from __IBMC__ and __IBMCPP__ to compute version number components. See documentation at: http://predef.sourceforge.net/precomp.html http://publib.boulder.ibm.com/infocenter/comphelp/v111v131/topic/com.ibm.xlc111.aix.doc/compiler_ref/xlmacros.html http://publib.boulder.ibm.com/infocenter/comphelp/v111v131/topic/com.ibm.xlcpp111.aix.doc/compiler_ref/xlmacros.html
| * | Detect Borland compiler version with its idBrad King2011-12-072-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decode hex digits from __BORLANDC__ to compute the version number components. Note that the constant encodes decimal digits as hex digits (never larger than 9). We represent them as decimal after extraction. See documentation at http://predef.sourceforge.net/precomp.html http://docwiki.embarcadero.com/RADStudio/en/Predefined_Macros
| * | Detect Intel compiler version with its id (#11937)Brad King2011-12-072-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decode decimal digits from __INTEL_COMPILER __INTEL_COMPILER_BUILD_DATE to compute the version number components. See documentation at: http://predef.sourceforge.net/precomp.html http://software.intel.com/sites/products/documentation/hpc/compilerpro/en-us/fortran/lin/compiler_f/bldaps_for/common/bldaps_use_presym.htm
| * | Detect MSVC compiler version with its idBrad King2011-12-072-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | Decode decimal digits from _MSC_VER, _MSC_FULL_VER, and _MSC_BUILD to compute the version number components. See documentation at: http://msdn.microsoft.com/en-us/library/b0084kay.aspx http://predef.sourceforge.net/precomp.html
| * | Detect GNU compiler version with its id (#6251)Brad King2011-12-072-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decode decimal digits from __GNUC__ __GNUC_MINOR__ __GNUC_PATCHLEVEL__ to compute version components. See documentation at http://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html http://predef.sourceforge.net/precomp.html
| * | Add framework to detect compiler version with its id (#12408)Brad King2011-12-078-2/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach CMakePlatformId.h to construct an "INFO:compiler_version[]" string literal from macros COMPILER_VERSION_(MAJOR|MINOR|PATCH|TWEAK) to be defined in CMake(C|CXX)CompilerId.(c|cpp) for each compiler. Provide conversion macros DEC() and HEX() to decode decimal or hex digits from integer values. Parse the version out of the compiler id binary along with the other INFO values already present. Store the result in variable CMAKE_<LANG>_COMPILER_VERSION in the format "major[.minor[.patch[.tweak]]]". Save the value persistently in CMake(C|CXX)Compiler.cmake in the build tree. Document the variable for internal use since we do not set it everywhere yet. Report the compiler version on the compiler id result line e.g. The C compiler identification is GNU 4.5.2 Report CMAKE_(C|CXX)_COMPILER_(ID|VERSION) in SystemInformation test.
* | | Merge topic 'FindPythonLibs-single-user-issue-12869'David Cole2012-01-171-1/+6
|\ \ \ | | | | | | | | | | | | | | | | a04ced3 FindPythonLibs: Search for single-user installs on Windows
| * | | FindPythonLibs: Search for single-user installs on WindowsChristian Andersson2012-01-101-1/+6
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When cmake searches for Python libs in Windows it searches in: [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs However, the information might not always reside there. The information could also reside in: [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs when one installs Python for a single user and not for all users.
* | | Merge topic 'vs10-fix-pdbname-issue-12328'David Cole2012-01-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 655a7dd VS10: Fix /pdb option vcxproj element name (#12328)
| * | | VS10: Fix /pdb option vcxproj element name (#12328)Brad King2012-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | The compiler tool uses "ProgramDataBaseFileName" but the linker tool uses just "ProgramDataBaseFile". Fix the generator accordingly.
* | | | Merge topic 'bootstrap-options'David Cole2012-01-171-61/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c19868b bootstrap: Forward options after '--' to cmake f39e82c bootstrap: Re-implement command line option processing dbf05f7 bootstrap: Update copyright year in version report
| * | | | bootstrap: Forward options after '--' to cmakeBrad King2011-12-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide an interface simpler than --init= to set cache values during bootstrap builds. For example: ./bootstrap --system-zlib -- -DZLIB_ROOT=/opt/zlib will configure CMake with a system zlib library and initialize ZLIB_ROOT in the cache for use by FindZLIB.
| * | | | bootstrap: Re-implement command line option processingBrad King2011-12-161-57/+28
| | | | | | | | | | | | | | | | | | | | | | | | | Use POSIX shell features to shorten and simplify bootstrap command-line option processing.
| * | | | bootstrap: Update copyright year in version reportBrad King2011-12-161-2/+2
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2012-01-171-1/+1
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2012-01-161-1/+1
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2012-01-151-1/+1
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2012-01-141-1/+1
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2012-01-131-1/+1
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2012-01-121-1/+1
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2012-01-111-1/+1
| |_|/ / |/| | |
* | | | KWSys Nightly Date StampKWSys Robot2012-01-101-1/+1
| |/ / |/| |
* | | Merge topic 'early-exit-loop'David Cole2012-01-091-0/+1
|\ \ \ | | | | | | | | | | | | | | | | c959725 Exit the loop when we have determined the language.
| * | | Exit the loop when we have determined the language.Stephen Kelly2012-01-081-0/+1
| | | |
* | | | Merge topic 'fix-docs-typo'David Cole2012-01-091-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 9bffb3f Fix typos arguement -> argument.
| * | | | Fix typos arguement -> argument.Stephen Kelly2012-01-081-2/+2
| |/ / /
* | | | Merge topic 'FindRubyFixes'David Cole2012-01-091-3/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9bca05 FindRuby.cmake: add more debug output 3db2c8b FindRuby: add more possible library names (for ubuntu, #12172) 93c55ec FindRuby: fix usage of RUBY_VERSION_MAJOR (#12172)
| * | | | FindRuby.cmake: add more debug outputAlex Neundorf2012-01-051-0/+4
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | FindRuby: add more possible library names (for ubuntu, #12172)Alex Neundorf2012-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | FindRuby: fix usage of RUBY_VERSION_MAJOR (#12172)Alex Neundorf2012-01-051-2/+2
| | | | | | | | | | | | | | | | | | | | Alex
* | | | | Merge topic 'update-libarchive'David Cole2012-01-09436-112680/+87214
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c611c6 libarchive: Restore CMake 2.6.3 as minimum version 2f5b677 libarchive: Update README-CMake.txt for new snapshot 156cb3b Merge branch 'libarchive-upstream' into update-libarchive fd42bf1 libarchive: Set .gitattributes to allow trailing whitespace 4f4fe6e libarchive 3.0.2-r4051 (reduced) 65b6e19 libarchive: Avoid bogus conversion warning from PGI compiler 9ccaeb1 libarchive: Suppress PathScale compiler warnings 2309438 libarchive: Rename isoent_rr_move_dir parameter isoent => curent b6ca96e libarchive: Include linux/types.h before linux/fiemap.h f293b73 libarchive: Define _XOPEN_SOURCE=500 on HP-UX 6781a09 libarchive: Cleanup after ZLIB_WINAPI check f15d757 libarchive: Remove hard-coded build configuration 3a9f449 libarchive: Use Apple copyfile.h API only if available 6af6b96 libarchive: Do not use MNT_NOATIME if not defined 02d5e40 libarchive: Check for 'struct statvfs' member 'f_iosize' 8b7ee30 libarchive: Do not use ST_NOATIME if not defined ...
| * | | | | libarchive: Restore CMake 2.6.3 as minimum versionBrad King2012-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream libarchive now requires CMake 2.8 to get the newer add_test functionality. Since we do not build libarchive's tests we do not need the requirement.
| * | | | | libarchive: Update README-CMake.txt for new snapshotBrad King2012-01-051-4/+4
| | | | | |
| * | | | | Merge branch 'libarchive-upstream' into update-libarchiveBrad King2012-01-0553-842/+814
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Utilities/cmlibarchive/CMakeLists.txt Utilities/cmlibarchive/libarchive/archive_windows.c
| | * | | | | libarchive 3.0.2-r4051 (reduced)LibArchive Upstream2012-01-0555-846/+820
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream libarchive using the following shell code. url=https://libarchive.googlecode.com/svn/release/3.0 v=3.0.2 r=4051 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: Set .gitattributes to allow trailing whitespaceBrad King2012-01-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not care about trailing whitespace in third-party code.
| * | | | | | libarchive: Avoid bogus conversion warning from PGI compilerBrad King2012-01-044-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot suppress PGI compiler warnings completely because even with the "-w" flag the compiler still writes a message containing "compilation completed with warnings" to stderr. A warning is triggered by expressions like test ? NULL : ptr_to_const_char test ? ".." : ptr_to_const_char that the PGI compiler handles incorrectly. It chooses the pointer type of the first option (either void* or char*) and warns about conversion of the second without a cast. Flip the expression logic to !test ? ptr_to_const_char : NULL !test ? ptr_to_const_char : ".." to help the compiler choose the proper result type.