summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* find_package: Test error and warning messages in failure casesBrad King2012-02-2831-0/+318
| | | | | | | | Add a "CMakeCommands.find_package" test to run CMake on a bunch of cases in which find_package fails. Check that the process return code and warning/error messages are as expected. Record expected test output in corresponding files for reference by the check. These files will also serve as a reference for the message text in each case.
* Merge branch 'test-CMakeCommands' into find_package-improve-messagesBrad King2012-02-283-7/+11
|\
| * Add infrastructure for CMakeCommands testsBrad King2012-02-283-7/+11
| | | | | | | | | | Generalize the build_command test framework as a macro to add the test. Process the CMakeCommands subdirectory explicitly.
* | find_package: Optionally warn when implicitly using Config modeBrad King2012-02-283-0/+62
| | | | | | | | | | | | | | | | | | | | | | Define variable CMAKE_FIND_PACKAGE_WARN_NO_MODULE for use by a project that wants to use an explicit mode in every call to find_package in order to generate more specific failure messages. Word the warning using the new CONFIG and MODULE mode keywords when the minimum required version of CMake is new enough to have them. Otherwise word the warning using the old NO_MODULE mode keyword. Inspired-by: Alex Neundorf <neundorf@kde.org>
* | find_package: Reject mixed use of MODULE- and CONFIG-only optionsBrad King2012-02-281-43/+37
| | | | | | | | | | Many options imply exclusive Config mode. The new MODULE option implies exclusive Module mode. Do not allow mixed combinations.
* | find_package: mention requested version number in error messageAlex Neundorf2012-02-281-2/+11
| | | | | | | | | | | | When neither a Find-module or a config file can be found print the required version so the user knows which version of the package to install.
* | find_package: add CONFIG mode keyword alias for NO_MODULEAlex Neundorf2012-02-281-4/+21
| |
* | find_package: add MODULE mode to use only Find-modulesAlex Neundorf2012-02-282-56/+117
| | | | | | | | | | The new mode differ from default mode in that that it doesn't fallback to config mode. The default mode stays unchanged.
* | find_package: improve error message when no Find module is presentAlex Neundorf2012-02-281-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain exactly why CMake is looking for a package configuration file and who is expected to provide what: CMake Error at CMakeLists.txt:7 (find_package): By not providing "Find<pkg>.cmake" in CMAKE_MODULE_PATH the caller has asked CMake to find a package configuration file provided by "<pkg>", but CMake did not find one. Could not find a package configuration file provided by "<pkg>" with any of the names: <pkg>Config.cmake <pkg>-config.cmake Add the installation prefix of "<pkg>" to CMAKE_PREFIX_PATH or set "<pkg>_DIR" to a directory containing one of the above files. If "<pkg>" provides separate development package or SDK be sure it has been installed. The first paragraph explains how CMake is interpreting the intention of the caller. This puts the blame or credit at the call site in the project code where it belongs both when it is a bug and when it is intentional. It can be dropped in NO_MODULE mode. Suggested-by: Brad King <brad.king@kitware.com>
* | find_package: rename NoModule to UseFindModulesAlex Neundorf2012-02-272-15/+15
| | | | | | | | | | | | ...positive logic is easier to handle Alex
* | find_package: print error if an invalid CONFIGS name is usedAlex Neundorf2012-02-271-0/+1
|/ | | | | | In commit 41c2895b (Added version support to Config mode of find_package command, 2008-01-28) the error message was computed but was not reported. Add the SetError call to report it.
* KWSys Nightly Date StampKWSys Robot2012-02-171-1/+1
|
* 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.
generated by cgit v0.12 at 2024-12-28 03:01:22 (GMT)