summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix project command documentation typo (#13384)Brad King2012-07-091-1/+1
| | | | | | | Commit 9090572f (Add ability to include a file in a project via a cache variable, 2012-02-17) taught the project() command to check variable "CMAKE_PROJECT_<projectName>_INCLUDE" but the documentation included an extra "_FILE" by accident. Remove it.
* Fix typo in error message, and remove redundent test.Bill Hoffman2012-03-012-3/+1
|
* Add ability to include a file in a project via a cache variable.Bill Hoffman2012-02-176-2/+37
| | | | | | If a variable exists called CMAKE_PROJECT_<projectName>_INCLUDE, the file pointed to by that variable will be included as the last step of the project command.
* KWSys Nightly Date StampKWSys Robot2012-02-161-1/+1
|
* KWSys Nightly Date StampKWSys Robot2012-02-151-1/+1
|
* Merge topic 'allfindmodules-no-force-gnuplot'David Cole2012-02-141-1/+1
|\ | | | | | | | | 2f306a9 AllFindModules test: do not enforce GNUPLOT version
| * AllFindModules test: do not enforce GNUPLOT versionRolf Eike Beer2012-02-131-1/+1
| | | | | | | | | | Ancient Gnuplot versions like 3.7.1 don't know about "--version". Disable this check so it doesn't break on machines with this version.
* | Merge topic 'asn_java_exec'David Cole2012-02-141-17/+37
|\ \ | | | | | | | | | | | | | | | | | | 18e8d2f java: Add CMAKE_JAVA_JAR_ENTRY_POINT optional variable. 525bb92 java: Add CMAKE_JAVA_TARGET_OUTPUT_DIR optional variable. 17a8e16 java: Factor jar output path.
| * | java: Add CMAKE_JAVA_JAR_ENTRY_POINT optional variable.Nicolas Despres2012-02-131-2/+11
| | | | | | | | | | | | | | | | | | Thanks to Matthieu Carpentier. Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
| * | java: Add CMAKE_JAVA_TARGET_OUTPUT_DIR optional variable.Nicolas Despres2012-02-131-9/+18
| | | | | | | | | | | | Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
| * | java: Factor jar output path.Nicolas Despres2012-02-131-9/+11
| |/ | | | | | | Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
* | Merge topic 'open64-compiler-flags'David Cole2012-02-142-0/+5
|\ \ | | | | | | | | | | | | 9b4e4c9 Improve checks for Open64 and g++ incompatible flags (#12119)
| * | Improve checks for Open64 and g++ incompatible flags (#12119)Matthias Kretz2012-02-122-0/+5
| | |
* | | Merge topic 'alsa_prefix_include_fix'David Cole2012-02-141-6/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | 11cf52e FindALSA: Fix version detection after last commit 815485e FindALSA: Fix incorrect include path detection
| * | | FindALSA: Fix version detection after last commitPhilip Lowman2012-02-121-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | Also, removed detection of header file from <PREFIX>/include. Can't find any example in alsa source code where the library headers were installed outside of <PREFIX>/include/alsa.
| * | | FindALSA: Fix incorrect include path detectionPhilip Lowman2012-02-111-4/+5
| | | | | | | | | | | | | | | | | | | | This fixes a bug where the alsa include path was being detected incorrectly (e.g. /usr/local/include/alsa instead of /usr/local/include)
* | | | Merge topic 'FixFeatureSummaryForREQUIREDPackages'David Cole2012-02-141-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e6c5b94 fix FeatureSummary for REQUIRED packages, they were reported as OPTIONAL
| * | | | fix FeatureSummary for REQUIRED packages, they were reported as OPTIONALAlex Neundorf2012-02-111-0/+9
| |/ / / | | | | | | | | | | | | Alex
* | | | Merge topic 'sdl-fphsa'David Cole2012-02-146-26/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | a6de8a5 FindSDL*: use FPHSA (#12467)
| * | | | FindSDL*: use FPHSA (#12467)Rolf Eike Beer2012-02-116-26/+18
| |/ / /
* | | | Merge topic 'libarchive-old-glibc'David Cole2012-02-141-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ca77902 libarchive: Workaround mbsnrtowcs assertion failure on old glibc
| * | | | libarchive: Workaround mbsnrtowcs assertion failure on old glibcBrad King2012-02-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CMake TarTest fails with the error mbsnrtowcs.c:116: __mbsnrtowcs: Assertion `status == GCONV_OK || status != GCONV_EMPTY_INPUT || status == GCONV_ILLEGAL_INPUT || status == GCONV_INCOMPLETE_INPUT || status == GCONV_FULL_OUTPUT' failed. on very old glibc versions. Work around the problem by pretending that mbsnrtowcs does not exist. Libarchive will fall back to mbrtowc.
* | | | | Merge topic 'change_qmake_path'David Cole2012-02-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9fb9416 Use upgraded qt on linux build machine.
| * | | | | Use upgraded qt on linux build machine.Bill Hoffman2012-02-101-1/+1
| | | | | |
* | | | | | Merge topic 'curl-CA-bundle'David Cole2012-02-141-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed14435 Add CURL_CA_BUNDLE option for SSL support (#12946)
| * | | | | | Add CURL_CA_BUNDLE option for SSL support (#12946)Artur Kedzierski2012-02-091-0/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | This adds the ability to specify the location of SSL CA bundle at compile time.
* | | | | | Merge topic 'cmake_add_fortran_subdirectory'David Cole2012-02-1412-0/+376
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e16406 CMakeAddFortranSubdirectory: Add NO_EXTERNAL_INSTALL option 6f6891b CMakeAddFortranSubdirectory: Always parse arguments 48a09f8 CMakeAddFortranSubdirectory: Make IMPORTED targets GLOBAL 067c1f4 VSGNUFortran: Disable test in special cases bd69e1c VSGNUFortran: Add special case for SunPro Fortran runtime library 414a780 CMakeAddFortranSubdirectory: Validate gfortran architecture 7e0d9f1 CMakeAddFortranSubdirectory: Find gfortran in PATH d6b0312 CMakeAddFortranSubdirectory: Fix documentation format and typos e4ae038 CMakeAddFortranSubdirectory: Allow full paths to directories 538c345 Add CMakeAddFortranSubdirectory to use MinGW gfortran in VS 3c6af5f Merge branch 'add-CheckLanguage-module' into CMakeAddFortranSubdirectory
| * | | | | | CMakeAddFortranSubdirectory: Add NO_EXTERNAL_INSTALL optionBrad King2012-02-092-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not yet support "make install" in the external project case. Document this explicitly in the interface. Require the caller to use an option to "disable" the unsupported behavior. This will allow us to add the behavior by default in the future without clobbering existing projects that handle the installation themselves.
| * | | | | | CMakeAddFortranSubdirectory: Always parse argumentsBrad King2012-02-091-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Parse arguments even in add_subdirectory() mode to validate them.
| * | | | | | CMakeAddFortranSubdirectory: Make IMPORTED targets GLOBALBill Hoffman2012-02-096-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmake_add_fortran_directory uses imported targets when using the mingw fortran compiler. This change makes those targets global in scope so they act just like the real targets that exist when a fortran compiler exists and regular add_subdirectory is used.
| * | | | | | VSGNUFortran: Disable test in special casesBill Hoffman2012-02-091-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ifort compiler found on some test machines does not support Mac universal binaries or the Linux Standard Base.
| * | | | | | VSGNUFortran: Add special case for SunPro Fortran runtime libraryBill Hoffman2012-02-091-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SunPro compiler does not add the fortran runtime library when creating a shared fortran library. Link to the SunPro Fortran runtime libraries explicitly.
| * | | | | | CMakeAddFortranSubdirectory: Validate gfortran architectureBrad King2012-02-091-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verify that MINGW_GFORTRAN not only points to a MinGW gfortran but also one that compiles for the target architecture. This prevents using a 32-bit gfortran in a 64-bit MSVC build.
| * | | | | | CMakeAddFortranSubdirectory: Find gfortran in PATHBrad King2012-02-091-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the find_program(MINGW_GFORTRAN) call use the PATHS option for hard-coded guesses instead of HINTS. This allows the user environment to override the guesses and corrects usage of the command options.
| * | | | | | CMakeAddFortranSubdirectory: Fix documentation format and typosBrad King2012-02-091-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Indent the function signature correctly. Fix some typos. Fix the copyright year.
| * | | | | | CMakeAddFortranSubdirectory: Allow full paths to directoriesBrad King2012-02-093-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the implementation to allow full paths with spaces. Change the interpretation of relative paths to be with respect to the current binary directory. This matches the convention used in ExternalProject. Test both full and relative paths in the VSGNUFortran test.
| * | | | | | Add CMakeAddFortranSubdirectory to use MinGW gfortran in VSBill Hoffman2012-02-0911-0/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a new module that allows for easy integration of MinGW gfortran and the Visual Studio compiler. It is done in a function called cmake_add_fortran_subdirectory. The patch also includes a test for this feature.
| * | | | | | Merge branch 'add-CheckLanguage-module' into CMakeAddFortranSubdirectoryBrad King2012-02-093-0/+89
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'qt4-translation-includes'David Cole2012-02-141-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a6d279 FindQt4: Add include directories for lupdate.
| * | | | | | | | FindQt4: Add include directories for lupdate.Clinton Stimpson2012-02-091-1/+7
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #12644. Thanks Bernd Lörwald for partial patch.
* | | | | | | | Merge topic 'qt4-warning-clarification'David Cole2012-02-141-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cbdfcc6 FindQt4: clarify warning message about incorrect Qt installation.
| * | | | | | | | FindQt4: clarify warning message about incorrect Qt installation.Clinton Stimpson2012-02-091-2/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #12915. Thanks Laurent Rineau and Brad King for input.
* | | | | | | | Merge topic 'PGI-recognise-pgfortran'David Cole2012-02-141-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb5f48f detect "pgfortran" as PGI Fortran compiler (#12425)
| * | | | | | | | detect "pgfortran" as PGI Fortran compiler (#12425)Rolf Eike Beer2012-02-081-4/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | See http://www.pgroup.com/doc/pgiug.pdf, page xviii.
* | | | | | | | Merge topic 'findx11-xmu'David Cole2012-02-141-0/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c008141 FindX11: also search for Xmu (#12447)
| * | | | | | | | FindX11: also search for Xmu (#12447)Rolf Eike Beer2012-02-081-0/+10
| |/ / / / / / /
* | | | | | | | Merge topic 'add-CheckLanguage-module'David Cole2012-02-143-0/+89
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | 5db99e8 Add CheckLanguage module
| * | | | | | | Add CheckLanguage moduleBrad King2012-02-083-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define a "check_language(<lang>)" macro to test whether <lang> can be enabled. Cache the result in CMAKE_<lang>_COMPILER. Add a test case covering expected results.
* | | | | | | | Merge topic 'ImproveCPackDoc-reloaded'David Cole2012-02-1421-100/+911
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4b77eb Avoid discovering system infos for documentation. Adding some path is enough. 9002f73 Fix non existent std::string::clear on VS6 02ccb32 Create getDocumentedModulesListInDir which may be used in other context. 24fbc28 Add missing section markup for CPackComponent bafd8a9 Example of builtin variable documentation (i.e. only used in C++ source code). 543f1ad Make the load of script documentation more efficient and dynamic. cdbd1a9 Fix another compiler warning due to a typo 52c53de Really avoid compiler warning about unused vars 37f90ed Calm down compiler warning about unused var 7c82b7f Fix potential bad memory access, thanks to Eike 62b589b Suppress unused var, beautify code, avoid 1 extra newline. 751713f Update bash completion file in order to handle new CPack doc options. 1629615 CPack Documentation extraction from CMake script begins to work 83e34dd Implement simple CMake script comment markup language. c6a0169 CPack begin the implementation of --help-command* and --help-variables*
| * | | | | | | | Avoid discovering system infos for documentation. Adding some path is enough.Eric NOULARD2012-02-141-19/+20
| | | | | | | | |