summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'qt4-apple-framework-fix'Brad King2011-07-261-13/+13
|\ | | | | | | | | 702538e Qt4: Fix reference of undefined variable when detecting frameworks on Mac OS X
| * Qt4: Fix reference of undefined variable when detecting frameworks on Mac OS XClinton Stimpson2011-07-251-13/+13
| |
* | Merge topic 'cross-qt4-find-includes'Brad King2011-07-261-1/+1
|\ \ | | | | | | | | | | | | 0ae8a34 Add qt4/QtCore to help find Qt headers when cross-compiling.
| * | Add qt4/QtCore to help find Qt headers when cross-compiling.Clinton Stimpson2011-07-221-1/+1
| | |
* | | Merge topic 'effective-platform-name'Brad King2011-07-263-9/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | 74c73d5 Correct KWStyle line too long error 0c030ef Add use of EFFECTIVE_PLATFORM_NAME to generated Xcode projects.
| * | | Correct KWStyle line too long errorDavid Cole2011-07-191-1/+2
| | | |
| * | | Add use of EFFECTIVE_PLATFORM_NAME to generated Xcode projects.David Cole2011-07-183-9/+30
| | | | | | | | | | | | | | | | | | | | Facilitates building iOS projects, enabling switching back and forth between simulator and device builds at development time.
* | | | Merge topic 'fix-tests-failing-with-Xcode4'Brad King2011-07-262-4/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a53fb7 Use correct default multiple architecture values in test 5f7acc8 Base architecture choice logic on Xcode version c050c59 Fix BuildDepends test to work with Xcode 4 923b030 Fix Architecture test to work with Xcode 4
| * | | | Use correct default multiple architecture values in testDavid Cole2011-07-191-9/+10
| | | | | | | | | | | | | | | | | | | | Even if CMAKE_OSX_ARCHITECTURES value is a single value...
| * | | | Base architecture choice logic on Xcode versionDavid Cole2011-07-182-7/+37
| | | | | | | | | | | | | | | | | | | | Not on Darwin version.
| * | | | Fix BuildDepends test to work with Xcode 4David Cole2011-07-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ppc tools are no longer available in the Xcode 4 installation. Eliminate the use of the hard-coded 'ppc' in the test when running on Snow Leopard or later.
| * | | | Fix Architecture test to work with Xcode 4David Cole2011-07-151-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ppc tools are no longer available in the Xcode 4 installation. Eliminate the use of the hard-coded 'ppc' in the test when running on Snow Leopard or later.
* | | | | Merge topic 'SetPropertyAppendString'Brad King2011-07-2619-35/+73
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9dbba1b Fix #12342: Add APPEND_STRING option to set_property()
| * | | | | Fix #12342: Add APPEND_STRING option to set_property()Alex Neundorf2011-07-1519-35/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set_property() has APPEND, which creates a list. E.g. when appending to COMPILE_FLAGS a string is needed, not a list. With the APPEND_STRING option the value is append as string, not as list. Alex
* | | | | | Merge topic 'MinorImprovementToTryCompileDocs'Brad King2011-07-261-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6b9df4 Minor fix to try_compile() docs (#12333)
| * | | | | | Minor fix to try_compile() docs (#12333)Alex Neundorf2011-07-121-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
* | | | | | | Merge topic 'CheckCXXSymbolExists'Brad King2011-07-262-9/+58
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 757a6a0 Add CheckCXXSymbolExists.cmake, so this can be used also for C++
| * | | | | | | Add CheckCXXSymbolExists.cmake, so this can be used also for C++Alex Neundorf2011-07-082-9/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit splits check_symbol_exists() so that the actual implementation can be also used by check_cxx_symbol_exists() Alex
* | | | | | | | Merge topic 'PushCheckState'Brad King2011-07-263-0/+92
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d64ba0b Fix copyright notice test 1325260 Add macros cmake_push/pop_check_state() as discussed on the list.
| * | | | | | | | Fix copyright notice testAlex Neundorf2011-07-071-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | | | Add macros cmake_push/pop_check_state() as discussed on the list.Alex Neundorf2011-07-073-0/+83
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds two macros cmake_push_check_state() and cmake_pop_check_state(), which can be used to save and restore the contents of the CMAKE_REQUIRED_xxx variables. Alex
* | | | | | | | Merge topic 'doc-custom-command-multiple-targets-issue-12311'Brad King2011-07-261-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0ece8f7 Document caveat of custom commands in multiple targets (#12311)
| * | | | | | | | Document caveat of custom commands in multiple targets (#12311)Brad King2011-06-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A common mistake when using custom commands is to list the output of a command in multiple targets that may build in parallel. Warn against this case in the documentation and suggest a better approach.
* | | | | | | | | Merge topic 'qt4-no-build-type'Brad King2011-07-261-0/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a2b208 Add -DQT_NO_DEBUG if no build type is specified so Qt plugins will work.
| * | | | | | | | | Add -DQT_NO_DEBUG if no build type is specified so Qt plugins will work.Clinton Stimpson2011-06-231-0/+3
| | | | | | | | | |
* | | | | | | | | | Merge topic 'DisableSwitchForFindPackage'Brad King2011-07-264-1/+41
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a50b5f Add a basic test for CMAKE_DISABLE_FIND_PACKAGE_<package> a66df08 Add documentation for the CMAKE_DISABLE_FIND_PACKAGE_<Name> switch 6e1d3ed Add a switch to disable a find_package() call completely
| * | | | | | | | | | Add a basic test for CMAKE_DISABLE_FIND_PACKAGE_<package>Alex Neundorf2011-06-232-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | | | | | Add documentation for the CMAKE_DISABLE_FIND_PACKAGE_<Name> switchAlex Neundorf2011-06-232-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | | | | | Add a switch to disable a find_package() call completelyAlex Neundorf2011-06-211-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed, this adds a switch CMAKE_DISABLE_FIND_PACKAGE_<name>, which, when set to TRUE, keeps the find_package() command from executing. When the package is REQUIRED at the same time, an error is generated. Alex
* | | | | | | | | | | Merge topic 'FindSubversion-non-interactive-issue-12304'Brad King2011-07-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c6e852 FindSubversion: Invoke svn non-interactively (#12304)
| * | | | | | | | | | | FindSubversion: Invoke svn non-interactively (#12304)Aaron C. Meadows2011-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise Subversion_WC_LOG hangs if credentials are not set.
* | | | | | | | | | | | Merge topic 'FindMPI-try-regular-compiler'Brad King2011-07-261-4/+62
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8756e77 Fix issues with removing try_compile input file. e00d2c4 Try regular compiler when no MPI compiler.
| * | | | | | | | | | | | Fix issues with removing try_compile input file.Todd Gamblin2011-06-211-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't remove input file - Put output in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY} - Remove try_compile variable from the cache after using
| * | | | | | | | | | | | Try regular compiler when no MPI compiler.Todd Gamblin2011-06-211-4/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If FindMPI can't interrogate any of the available compilers, it attempts to compile simple MPI programs with CMAKE_${lang}_COMPILER. If this works, it uses that as MPI_${lang}_COMPILER. This allows MPI to be discovered on Cray XT/XE systems, where modules are used and cc, CC, and ftn compilers *are* MPI compilers.
* | | | | | | | | | | | | Merge topic 'performance_fix'Brad King2011-07-261-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e4ba89 Only pay for unused variable checking if it is on.
| * | | | | | | | | | | | | Only pay for unused variable checking if it is on.Bill Hoffman2011-06-211-0/+4
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge topic 'vs-ia64'Brad King2011-07-2612-40/+239
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aed92cc Add VisualStudio 9 and 10 generators for Itanium platform d44c68f VS: Factor Find64BitTools out of Win64 generator to parent
| * | | | | | | | | | | | | | Add VisualStudio 9 and 10 generators for Itanium platformMatej Hribernik2011-06-208-3/+202
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | VS: Factor Find64BitTools out of Win64 generator to parentMatej Hribernik2011-06-204-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will be shared with a forthcoming IA64 generator.
* | | | | | | | | | | | | | | Merge topic 'asn_java_support'Brad King2011-07-266-41/+968
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1417a55 Java: Fix documentation format and indentation 0b7627d Java: Use set_property/get_property for target variables. b01a505 Java: Create correct jar archive dependencies. f99c312 Java: Added some dependency magic to avoid recompilations. f3233ba Java: Create java_class_filelist only if it does't exist. a22ed3d Tests: Check for the new Java exeutable variables. c177c8e Tests: Java tests should test UseJava.cmake 5c2106c Modules: Added CMake Java support. a4b6275 FindJava: Find missing java development executables.
| * | | | | | | | | | | | | | | Java: Fix documentation format and indentationAndreas Schneider2011-06-201-169/+162
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Java: Use set_property/get_property for target variables.Andreas Schneider2011-06-201-37/+77
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Java: Create correct jar archive dependencies.Oliver Buchtala2011-04-041-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The command generating the jar file depends on java_class_filelist which is generated by another command. Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
| * | | | | | | | | | | | | | | Java: Added some dependency magic to avoid recompilations.Oliver Buchtala2011-04-041-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile java sources within a custom_command using automatically checked file dependencies and create java_class_filelist after java compile. Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
| * | | | | | | | | | | | | | | Java: Create java_class_filelist only if it does't exist.Oliver Buchtala2011-04-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
| * | | | | | | | | | | | | | | Tests: Check for the new Java exeutable variables.Andreas Schneider2011-03-291-2/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Tests: Java tests should test UseJava.cmakeAndreas Schneider2011-03-291-39/+6
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Modules: Added CMake Java support.Andreas Schneider2011-03-293-0/+897
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides: find_jar add_jar install_jar install_jni_symlink create_javadoc
| * | | | | | | | | | | | | | | FindJava: Find missing java development executables.Andreas Schneider2011-03-291-0/+18
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge topic 'mingw-make-use-native-echo-issue-12283'Brad King2011-07-263-27/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b4d3ad MinGW: Remove old workaround and use native echo (#12283)
generated by cgit v0.12 at 2024-11-15 10:51:07 (GMT)