summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'improve-findlibxslt'David Cole2012-02-211-3/+15
|\ | | | | | | | | 70697a8 FindLibXslt: support version selection
| * FindLibXslt: support version selectionRolf Eike Beer2012-02-171-3/+15
| |
* | Merge topic 'improve-findruby'David Cole2012-02-211-31/+26
|\ \ | | | | | | | | | | | | 854e762 FindRuby: clean up querying variables from Ruby
| * | FindRuby: clean up querying variables from RubyRolf Eike Beer2012-02-171-31/+26
| |/ | | | | | | | | | | | | Newer Ruby versions (from 1.9 onward) seem to warn if you query Config::CONFIG and print a warning to use RbConfig instead. RbConfig seems to also work in older versions, at least in 1.8. Use a macro to query RbConfig first and only if that doesn't give anything fall back to Config.
* | Merge topic 'findblas-bugs'David Cole2012-02-212-141/+154
|\ \ | | | | | | | | | | | | 4585e57 FindBLAS/FindLAPACK: Work with MKL version 10.3 (#12924, #12925)
| * | FindBLAS/FindLAPACK: Work with MKL version 10.3 (#12924, #12925)Alexey Ozeritsky2012-02-162-141/+154
| | |
* | | Merge topic 'suppress-clang-warning'David Cole2012-02-211-0/+1
|\ \ \ | | | | | | | | | | | | | | | | f4f94f3 CTestCustom: Suppress clang warning on the dashboard
| * | | CTestCustom: Suppress clang warning on the dashboardDavid Cole2012-02-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "argument unused during compilation" -- well, thanks, but ... If somebody has a fix to eliminate this warning entirely, rather than simply suppressing it from our dashboard results, I'm all ears.
* | | | Merge topic 'try-compile-random-name'David Cole2012-02-211-4/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4fbdce2 try_compile: Use random executable file name (#12957)
| * | | | try_compile: Use random executable file name (#12957)Brad King2012-02-161-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Append a random number to the "cmTryCompileExec" file name to avoid rapid creation and deletion of the same executable file name. Some filesystems lock executable files when they are created and cause subsequent try-compile tests to fail arbitrarily. Use a different name each time to avoid conflict.
* | | | | Merge topic 'FindX11_SearchXxf86vm'David Cole2012-02-211-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b295162 fix #6976: FindX11 also searches for X11_Xxf86vm_LIB
| * | | | | fix #6976: FindX11 also searches for X11_Xxf86vm_LIBAlex Neundorf2012-02-161-3/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This contains a change, which changes the behaviour a bit: now X11_xf86vmode_FOUND is only set to TRUE and the include directory is added to X11_INCLUDE_DIR, if additionally to X11_xf86vmode_INCLUDE_PATH also X11_Xxf86vm_LIB has been found. I hope this doesn't cause regressions somewhere. Alex
* | | | | Merge topic 'fix_fortran_dir_two_dirs'David Cole2012-02-211-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 087bea3 Allow two cmake_add_fortran_subdirectory calls in the same project.
| * | | | | Allow two cmake_add_fortran_subdirectory calls in the same project.Bill Hoffman2012-02-161-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure the build_mingw.cmake.in config_mingw.cmake.in files into the binary directory of the directory being built, not the top level binary directory for the project.
* | | | | | Merge topic 'improve-findglut'David Cole2012-02-211-18/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14dadbd FindGLUT: honor REQUIRED (#12466)
| * | | | | | FindGLUT: honor REQUIRED (#12466)Rolf Eike Beer2012-02-151-18/+16
| | | | | | |
* | | | | | | Merge topic 'honor-gcov-empty-coverage'David Cole2012-02-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58d75e2 CTest: mark all gcov covered files as covered
| * | | | | | | CTest: mark all gcov covered files as coveredRolf Eike Beer2012-02-151-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even if there are no lines covered in the file the gcov coverage report still contains valueable information, the amount of uncovered lines and which exactly they are. Set 'Covered="true"' for files we have a gcov report for even if they have no lines covered. Otherwise CDash will neither show the uncovered line count nor the detailed coverage report for this file. When CTEST_EXTRA_COVERAGE_GLOB was used to collect otherwise uncovered files 'Covered="true"' was unconditionally set, so this can't be worse here.
* | | | | | | Merge topic 'teach_ctest_ninja_errors'David Cole2012-02-211-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ffb27ca Teach CTest what a ninja error looks like.
| * | | | | | | Teach CTest what a ninja error looks like.Bill Hoffman2012-02-151-0/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow ninja dashboards to show ninja errors as well as compiler errors from the ninja build.
* | | | | | | Merge topic 'findperllibs-windows'David Cole2012-02-211-31/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10dfec3 FindPerlLibs: properly detect libperl on Windows (#12224)
| * | | | | | | FindPerlLibs: properly detect libperl on Windows (#12224)Rolf Eike Beer2012-02-141-31/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also cleans up a bunch of things on the way: -when perl was queried for paths they were not converted to CMake style on Windows. -the result when perl was queried for the perl library name was ignored since it was expanded with the possible paths, which is not a valid input for find_library(). If perl returns a library name we now will look only for this name and not for the default names and use the default names only when the executable does not give us a hint. -get rid of 2 variables that were only used at one place and directly put the values in the call to find_library() and find_path(). Inspired by Jeff Trull
* | | | | | | | Merge topic 'link-OpenBSD-shared-libs-issue-12954'David Cole2012-02-212-1/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afc75bb Recognize OpenBSD versioned .so names (#12954)
| * | | | | | | | Recognize OpenBSD versioned .so names (#12954)Brad King2012-02-132-1/+14
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenBSD shared library names end in a ".#.#" version number suffix. Teach cmComputeLinkInformation to tolerate the extra suffix after the normal library name suffixes when parsing library names.
* | | | | | | | Merge topic 'FindGetTextFixMultipleTargets'David Cole2012-02-211-5/+43
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b48822 FindGetText: fix multiple targets with the same name problem (CMP0002)
| * | | | | | | | FindGetText: fix multiple targets with the same name problem (CMP0002)Alex Neundorf2012-02-121-5/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The functions in FindGettext create a custom target. If the functions are called multiple times, multiple times the same target is created. This works only if CMP0002 is set to OLD. With this patch there is only one central target created, and each invocation of the function creates a target with a unique name and make the central target depend on this one. Alex
* | | | | | | | | KWSys Nightly Date StampKWSys Robot2012-02-211-1/+1
| | | | | | | | |
* | | | | | | | | KWSys Nightly Date StampKWSys Robot2012-02-201-1/+1
| | | | | | | | |
* | | | | | | | | KWSys Nightly Date StampKWSys Robot2012-02-191-1/+1
| | | | | | | | |
* | | | | | | | | KWSys Nightly Date StampKWSys Robot2012-02-181-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | 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.