Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge topic 'FindHDF5-fix-header-langs' | Brad King | 2017-02-17 | 1 | -2/+2 |
|\ | |||||
| * | FindHDF5: Fix search for language-specific header file | Brad King | 2017-02-17 | 1 | -2/+2 |
* | | Merge topic 'FindHDF5-include-dir-advanced' | Brad King | 2017-02-17 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | FindHDF5: Restore HDF5_<LANG>_INCLUDE_DIR advanced cache entry mark | Brad King | 2017-02-17 | 1 | -1/+1 |
* | | Merge topic 'FindOpenSSL-crypto-name' | Brad King | 2017-02-17 | 1 | -0/+1 |
|\ \ | |||||
| * | | FindOpenSSL: Add another name for libcrypto with MSVC | Kevin Whitaker | 2017-02-16 | 1 | -0/+1 |
* | | | Merge topic 'TestBigEndian-cxx-only' | Brad King | 2017-02-16 | 1 | -7/+19 |
|\ \ \ | |||||
| * | | | TestBigEndian: Fix to work with CXX without C | Uwe Koloska | 2017-02-15 | 1 | -7/+19 |
| |/ / | |||||
* | | | Merge topic 'cuda-msvc-flags' | Brad King | 2017-02-16 | 2 | -11/+12 |
|\ \ \ | |/ / |/| | | |||||
| * | | CUDA: Fix default compiler flags on Windows | Brad King | 2017-02-15 | 2 | -11/+12 |
| * | | Merge branch 'cuda-no-Os' into release | Brad King | 2017-02-14 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge branch 'cuda-with-c' into release | Brad King | 2017-02-14 | 2 | -0/+8 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'backport-clang-format-cuda' into release | Brad King | 2017-02-14 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'cmake_provide_include_dir_for_toolkit' into release | Brad King | 2017-02-13 | 2 | -4/+32 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge topic 'cuda-drop-comment' | Brad King | 2017-02-15 | 1 | -7/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | CMakeDetermineCUDACompiler: Drop out-of-date comment | Brad King | 2017-02-14 | 1 | -7/+0 |
* | | | | | | | Merge topic 'cuda-with-c' | Brad King | 2017-02-15 | 2 | -0/+8 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | CUDA: Link to standard system libraries when linking as CUDA | Brad King | 2017-02-14 | 2 | -0/+8 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge topic 'cuda-no-Os' | Brad King | 2017-02-15 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | | | |||||
| * | | | | CUDA: Do not use non-existent -Os flag for nvcc | Brad King | 2017-02-14 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
| * | | | Merge branch 'sphinx-1.4' into release | Brad King | 2017-02-10 | 1 | -3/+3 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'backport-clang-format-cuda' into clang-format-cuda | Brad King | 2017-02-14 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Modules: Run clang-format on CUDA code | Brad King | 2017-02-14 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge topic 'cmake_provide_include_dir_for_toolkit' | Brad King | 2017-02-14 | 2 | -4/+32 |
|\ \ \ \ | |/ / / | |||||
| * | | | CUDA: Detect the toolkit include directories | Robert Maynard | 2017-02-10 | 2 | -4/+32 |
| |/ / | |||||
* | | | Merge topic 'vs-nasm' | Brad King | 2017-02-10 | 2 | -2/+23 |
|\ \ \ | |||||
| * | | | VS: Add support for ASM_NASM language | Evgeny Fimochkin | 2017-02-07 | 2 | -2/+23 |
* | | | | Merge topic 'ExtractGTestMacro' | Brad King | 2017-02-10 | 2 | -57/+76 |
|\ \ \ \ | |||||
| * | | | | GoogleTest: Add module to contain gtest_add_tests independently | Bradley Lowekamp | 2017-02-07 | 2 | -57/+76 |
| | |/ / | |/| | | |||||
* | | | | Merge topic 'gcc-cpp98' | Brad King | 2017-02-10 | 1 | -2/+1 |
|\ \ \ \ | |||||
| * | | | | g++ knows about C++98 selection flags since at least 3.4 | Rolf Eike Beer | 2017-02-08 | 1 | -2/+1 |
* | | | | | Merge topic 'sphinx-1.4' | Brad King | 2017-02-10 | 1 | -3/+3 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Help: Fix cmake code block warnings produced by Sphinx 1.4 | Brad King | 2017-02-10 | 1 | -3/+3 |
| | |/ | |/| | |||||
* | | | Merge topic 'determine_id_without_user_specified_flags' | Brad King | 2017-02-07 | 2 | -21/+30 |
|\ \ \ | |||||
| * | | | CMakeDetermineCompilerId: check with and without user-specified flags | Michael Maltese | 2017-02-06 | 2 | -21/+30 |
| |/ / | |||||
* | | | Merge topic 'FindProtobuf-static-libs' | Brad King | 2017-02-07 | 1 | -0/+27 |
|\ \ \ | |||||
| * | | | FindProtobuf: Add option to find static libraries on UNIX | Sébastien GALLOU | 2017-02-06 | 1 | -0/+27 |
| | |/ | |/| | |||||
* | | | Merge topic 'FeatureSummary_description' | Brad King | 2017-02-07 | 1 | -14/+47 |
|\ \ \ | |||||
| * | | | FeatureSummary: Add FeatureSummary_<TYPE>_DESCRIPTION global properties | Daniele E. Domenichelli | 2017-02-06 | 1 | -2/+17 |
| * | | | FeatureSummary: Add DEFAULT_DESCRIPTION option to feature_summary | Daniele E. Domenichelli | 2017-02-06 | 1 | -14/+32 |
| |/ / | |||||
* | | | CPackWIX: Introduce new CPACK_WIX_ROOT_FOLDER_ID variable | Nils Gladitz | 2017-02-06 | 1 | -0/+11 |
|/ / | |||||
* | | FeatureSummary: Fix documentation | Daniele E. Domenichelli | 2017-02-06 | 1 | -8/+10 |
|/ | |||||
* | Merge topic 'productbuild_signing' | Brad King | 2017-02-06 | 1 | -0/+20 |
|\ | |||||
| * | CPackProductBuild: Add options to sign packages | Roman Wüger | 2017-02-04 | 1 | -0/+20 |
* | | Merge topic 'androidtestutilities_cleanup' | Brad King | 2017-02-06 | 2 | -6/+15 |
|\ \ | |||||
| * | | AndroidTestUtilities: do not require ExternalData unconditionally | Zack Galbreath | 2017-02-04 | 1 | -5/+12 |
| * | | AndroidTestUtilities: ignore exit status of ls | Zack Galbreath | 2017-02-03 | 1 | -1/+3 |
* | | | Merge topic 'FindHDF5-fix-HDF5_ROOT' | Brad King | 2017-02-06 | 1 | -83/+102 |
|\ \ \ | |||||
| * | | | FindHDF5: Restore HDF5_INCLUDE_DIR in all code paths | Brad King | 2017-02-03 | 1 | -5/+6 |
| * | | | FindHDF5: Restore fallback to static libraries | Brad King | 2017-02-03 | 1 | -11/+12 |