summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove trailing whitespace from most CMake and C/C++ codeKitware Robot2012-08-13614-3951/+3951
| | | | | | | | | | | | | | | | | Our Git commit hooks disallow modification or addition of lines with trailing whitespace. Wipe out all remnants of trailing whitespace everywhere except third-party code. Run the following shell code: git ls-files -z -- \ bootstrap doxygen.config '*.readme' \ '*.c' '*.cmake' '*.cpp' '*.cxx' \ '*.el' '*.f' '*.f90' '*.h' '*.in' '*.in.l' '*.java' \ '*.mm' '*.pike' '*.py' '*.txt' '*.vim' | egrep -z -v '^(Utilities/cm|Source/(kwsys|CursesDialog/form)/)' | egrep -z -v '^(Modules/CPack\..*\.in)' | xargs -0 sed -i 's/ \+$//'
* Merge topic 'watcom-compiler-version'Brad King2012-08-131-37/+24
|\ | | | | | | af42ae4 Watcom: Simplify compiler version detection (#11866)
| * Watcom: Simplify compiler version detection (#11866)Brad King2012-08-131-37/+24
| | | | | | | | | | | | | | | | Since commit c198730b (Detect Watcom compiler version with its id, 2011-12-07) the CMAKE_(C|CXX)_COMPILER_VERSION variables are set for the Watcom compiler. Use these in Windows-wcl386.cmake to set the old WATCOM1* version variables. This avoids using the old EXECUTE_PROCESS command which failed due to extra quotes anyway.
* | Merge topic 'xcode-select'David Cole2012-08-131-2/+17
|\ \ | | | | | | | | | | | | e88bae7 Xcode: Run xcode-select to find Xcode version file (#13463)
| * | Xcode: Run xcode-select to find Xcode version file (#13463)Brad King2012-08-101-2/+17
| | | | | | | | | | | | | | | | | | | | | Multiple versions of Xcode may be installed in different locations. Run "xcode-select --print-path" to detect the active Xcode location and parse its Contents/version.plist file. Note that the Xcode.app directory name may vary in developer versions.
* | | Merge topic 'CPackRPM-fixRelocatablePrefix'David Cole2012-08-131-1/+20
|\ \ \ | | | | | | | | | | | | | | | | 822c1ea Do not include directories which are part of the package install prefix.
| * | | Do not include directories which are part of the package install prefix.Andy Piper2012-08-071-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | This fix bug #0013451. The bug prevents theorerically relocatable RPM package to be installed properly. Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
* | | | Merge topic 'fix-typo-13456'David Cole2012-08-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 67f11cf FindSelfPackers: fix typo (#13456)
| * | | | FindSelfPackers: fix typo (#13456)Rolf Eike Beer2012-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | Correction by Modestas Vainius.
* | | | | Merge topic 'doc_fixes'David Cole2012-08-132-196/+196
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 76d6c59 Clean up documentation formatting so that it is rendered properly in HTML.
| * | | | | Clean up documentation formatting so that it is rendered properly in HTML.Zack Galbreath2012-08-032-196/+196
| | | | | |
* | | | | | Merge topic 'xcode-object-dir'David Cole2012-08-133-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b237dbd Xcode: Fix object library references in multi-project trees (#13452)
| * | | | | | Xcode: Fix object library references in multi-project trees (#13452)Brad King2012-08-033-1/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cmGlobalXCodeGenerator::Generate we generate a .xcodeproj for each directory in the tree containing a project() command. First we iteratively use SetGenerationRoot to add "ALL_BUILD" and other targets to each project. This leaves "CurrentProject" set to the last project when we invoke cmGlobalGenerator::Generate, which is not the same as the top-level project if any subdirectories invoke the project() command. When cmGlobalGenerator::Generate reaches CreateGeneratorTargets it constructs cmGeneratorTarget and calls ComputeTargetObjects exactly once per target. In this context the value of CurrentProject is undefined so we cannot pass it to GetObjectsNormalDirectory. Use "$(PROJECT_NAME)" instead so it will adapt automatically to each project. Also teach Tests/ObjectLibrary to cover this case.
* | | | | | Merge topic 'select-compiler'David Cole2012-08-139-93/+147
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e58e5b Prefer generic system compilers by default for C, C++, and Fortran 796e337 Factor common code out of CMakeDetermine(ASM|C|CXX|Fortran)Compiler b708f1a CMakeDetermine(C|CXX)Compiler: Consider Clang compilers
| * | | | | | Prefer generic system compilers by default for C, C++, and FortranBrad King2012-08-029-4/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach CMake to prefer the system default compiler automatically when no compiler is specified. By default use "cc" for C, "CC" for C++, and "f95" for Fortran. Load a new Platform/<os>-<lang>.cmake module to allow each platform to specify for each language its system compiler name(s) and/or exclude certain names. Create Platform/(CYGWIN|Darwin|Linux|Windows)-CXX.cmake modules to specify "c++" as the system C++ compiler name for these platforms. On systems that use case-insensitive filesystems exclude C++ compiler names that are distinguished from C compiler names only by case. This will change the default compiler selection for existing build scripts that do not specify a compiler when run on machines with separate system and GNU compilers both installed in the PATH. We do not make this change in default behavior lightly. However: (1) If a given build really needs specific compilers one should specify them explicitly e.g. by setting CC, CXX, and FC in the environment. (2) The motivating case is to prefer the system Clang on newer OS X systems over the older GNU compilers typically also installed. On such systems the names "cc" and "c++" link to Clang. This is the first platform known to CMake on which "c++" is not a GNU compiler. The old behavior selected "gcc" for C and "c++" C++ and therefore chooses GNU for C and Clang for C++ by default. The new behavior selects GNU or Clang consistently for both languages on older or newer OS X systems, respectively. (3) Other than the motivating OS X case the conditions under which the behavior changes do not tend to exist in default OS installations. They typically occur only on non-GNU systems with manually-installed GNU compilers. (4) The consequences of the new behavior are not dire. At worst the project fails to compile with the system compiler when it previously worked with the non-system GNU compiler. Such failure is easy to work around (see #1). In short this change creates a more sensible default behavior everywhere and fixes poor default behavior on a widely-used platform at the cost of a modest change in behavior in less-common conditions.
| * | | | | | Factor common code out of CMakeDetermine(ASM|C|CXX|Fortran)CompilerBrad King2012-08-025-86/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compiler candidate list selection and search code for C, C++, ASM, and Fortran languages was duplicated across four modules. To look for compilers adjacent to already-enabled languages the C and CXX modules each used _CMAKE_USER_(C|CXX)_COMPILER_PATH and the ASM module used _CMAKE_TOOLCHAIN_LOCATION. Since commit 4debb7ac (Bias Fortran compiler search with C/C++ compilers, 2009-09-09) CMake prefers Fortran compilers matching the vendor and directory of an enabled C or C++ compiler. Factor out the common functionality among the four languages into a new CMakeDetermineCompiler module. Generalize the Fortran implementation so that all languages may each use the vendor and directory of the other languages that have already been enabled. For now do not list any vendor-specific names for C, C++, or ASM so that only the directory preference is used for these languages (existing behavior).
| * | | | | | CMakeDetermine(C|CXX)Compiler: Consider Clang compilersBrad King2012-07-312-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Look for "clang" or "clang++" compiler executables so Clang will be used when it is the only compiler available. Prefer them last to avoid changing compiler default preferences for existing scripts.
* | | | | | | Merge topic 'directory-typo'David Cole2012-08-135-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c8722f Fix typo direcotry -> directory (and similar) [#13444]
| * | | | | | | Fix typo direcotry -> directory (and similar) [#13444]Rolf Eike Beer2012-07-305-6/+6
| | | | | | | |
* | | | | | | | Merge topic 'SelectLibraryConfiguration-multi-lib-per-var2'David Cole2012-08-131-8/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5797512 SelectLibraryConfiguration: generate correct output when input vars are lists
| * | | | | | | | SelectLibraryConfiguration: generate correct output when input vars are listsRolf Eike Beer2012-07-291-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case that any of the input variables that hold the library names contains more than just a single library the "debug" or "optimized" keywords were only prepended to the first item, making all other libs appear in all configurations. Just treat both input variables as lists. Thanks to Philipp Berger <newsletters@philippberger.de> for pointing me at this.
* | | | | | | | | Merge topic 'FindOpenSSL-improve'David Cole2012-08-131-35/+43
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3cfb68d FindOpenSSL: remove leftover comment fc798ed FindOpenSSL: cleanup path hints c78a7d1 FindOpenSSL: let CMake handle environment variable HINTS 7464519 FindOpenSSL: use SelectLibraryConfigurations 4b793ad FindOpenSSL: find cross-compiled OpenSSL from MinGW (#13431)
| * | | | | | | | | FindOpenSSL: remove leftover commentRolf Eike Beer2012-07-291-1/+0
| | | | | | | | | |
| * | | | | | | | | FindOpenSSL: cleanup path hintsRolf Eike Beer2012-07-291-19/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -only use Windows-specific paths on Windows -recode the contents of $ENV{PROGRAMFILES} to be a valid CMake path before using it
| * | | | | | | | | FindOpenSSL: let CMake handle environment variable HINTSRolf Eike Beer2012-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will automatically make sure the paths will get recoded to proper separators on Windows
| * | | | | | | | | FindOpenSSL: use SelectLibraryConfigurationsRolf Eike Beer2012-07-291-13/+5
| | | | | | | | | |
| * | | | | | | | | FindOpenSSL: find cross-compiled OpenSSL from MinGW (#13431)Rolf Eike Beer2012-07-291-2/+10
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggested-by: Dominik Schmidt <dev@dominik-schmidt.de>
* | | | | | | | | Merge topic 'EclipseFixBadLinkedResources'David Cole2012-08-131-0/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ea5dc5 Eclipse: fix #13358: don't create bad linked resources
| * | | | | | | | | Eclipse: fix #13358: don't create bad linked resourcesAlex Neundorf2012-07-281-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create linked resources which point to CMAKE_BINARY_DIR itself or one of its parent dirs. Eclipse complained about that. Alex
* | | | | | | | | | Merge topic 'EclipseAddSupportForJuno'David Cole2012-08-131-1/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53cc102 Eclipse: improve (fix ?) version detection on OSX bcccddc Eclipse: add support for the 4.2 Juno release (#13367)
| * | | | | | | | | | Eclipse: improve (fix ?) version detection on OSXAlex Neundorf2012-07-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is probably related to a framework installation I guess. This is part of the patch in #13367 from Nicholas Yue. Alex
| * | | | | | | | | | Eclipse: add support for the 4.2 Juno release (#13367)Alex Neundorf2012-07-281-1/+4
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks for the path to Nicholas Yue. Alex
* | | | | | | | | | Merge topic 'mixed-lib-to-lib64'David Cole2012-08-1318-80/+112
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af80da3 remove lib64 Unix paths if the respective lib path is also given 733726e find_library: Fix mixed lib->lib64 (non-)conversion cases (#13419) 54add62 find_library: Simplify lib->lib<arch> expansion 6ca2f82 find_library: Refactor lib->lib64 conversion 1fe4b82 find_library: Add test covering lib->lib64 cases
| * | | | | | | | | | remove lib64 Unix paths if the respective lib path is also givenRolf Eike Beer2012-07-213-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If FIND_LIBRARY_USE_LIB64_PATHS is set both will be searched anyway.
| * | | | | | | | | | find_library: Fix mixed lib->lib64 (non-)conversion cases (#13419)Brad King2012-07-203-18/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a search path contains multiple "lib/" instances we previously converted all or none. This fails for cases where only some of the multiple instances must be converted. Teach AddArchitecturePaths to generate all combinations that exist. Uncomment these cases in the CMakeOnly.find_library test now that they work.
| * | | | | | | | | | find_library: Simplify lib->lib<arch> expansionBrad King2012-07-201-17/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify cmFindLibraryCommand::AddArchitecturePaths logic to avoid recording a separate 'found' status and populating an entire vector<string> just to throw it away.
| * | | | | | | | | | find_library: Refactor lib->lib64 conversionBrad King2012-07-202-49/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously methods AddArchitecturePaths and AddLib64Paths were almost identical. Replace the latter with a call to the former. Fix the AddArchitecturePaths implementation to add trailing slashes to all tested paths.
| * | | | | | | | | | find_library: Add test covering lib->lib64 casesBrad King2012-07-2013-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a "CMakeOnly.find_library" test covering various cases involving lib->lib64 (non-)conversion. Comment out cases involving mixed path components "lib" and "lib64", such as lib/A/lib64 and lib64/A/lib, as these are known to be broken currently.
* | | | | | | | | | | Merge topic 'use_normal_ouput_with_chdir'David Cole2012-08-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ddd3b9 Use OUTPUT_NORMAL instead of OUTPUT_MERGE for cmake -E chdir.
| * | | | | | | | | | | Use OUTPUT_NORMAL instead of OUTPUT_MERGE for cmake -E chdir.Bill Hoffman2012-07-201-1/+1
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using OUTPUT_MERGE can cause the output to be jumbled in some cases.
* | | | | | | | | | | Merge topic 'release-script-fixes'David Cole2012-08-131-3/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 214589b Add ability to run as a ctest -S script also
| * | | | | | | | | | | Add ability to run as a ctest -S script alsoDavid Cole2012-06-221-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Then, use ctest_sleep to separate uploads by at least one second each, so that the files on the web server all get distinct time stamps. Then, when viewed on the web server, sorted by time, they are also sorted alphabetically.
* | | | | | | | | | | | Merge topic 'exclude-ExternalProject-test-for-cygwin-release-script'David Cole2012-08-132-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a17311 Release: Temporarily exclude ExternalProject test on cygwin
| * | | | | | | | | | | Release: Temporarily exclude ExternalProject test on cygwinDavid Cole2012-06-222-1/+9
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only temporarily until we can setup a new cygwin build machine for making releases. It's specific to the script that runs on dash2win64 anyhow. When we add a new script to run it on a different machine, and stop building the cygwin releases on dash2win64, this change will naturally no longer apply.
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2012-08-131-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2012-08-121-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2012-08-111-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2012-08-101-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Begin post-2.8.9 developmentDavid Cole2012-08-091-2/+2
| | | | | | | | | | |
* | | | | | | | | | | CMake 2.8.9v2.8.9David Cole2012-08-092-1/+5
| | | | | | | | | | |