aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into cleanup-cmakeGennadiy Civil2018-08-151-3/+3
|\
| * Change location of generated pkg-config files from CMAKE_BINARY_DIR to ↵Elias Daler2018-08-131-3/+3
| | | | | | | | gmock/gtest_BINARY_DIR (#1717)
* | Clean up cache non-advanced variable for subprojectHenry Fredrick Schreiner2018-04-051-4/+14
|/
* Merge branch 'master' into fix-core-dump-sharedGennadiy Civil2018-01-091-7/+7
|\
| * remove extra lineBryan Zimmerman2017-12-111-1/+0
| |
| * Merge branch 'master' into masterbryanzim2017-12-111-2/+2
| |\
| | * Merge branch 'master' into use-system-includesGennadiy Civil2017-12-081-0/+2
| | |\
| | * | make includes systemSam Lunt2017-11-271-2/+2
| | | |
| * | | Merge branch 'master' into masterbryanzim2017-12-081-1/+2
| |\ \ \ | | | |/ | | |/|
| * | | fix for VS2017 deprecation of ::tr1::tupleBryan Zimmerman2017-10-271-5/+7
| | |/ | |/| | | | | | | | | | change static_cast to ImplicitCast_ for consitency fixes for building with path names containing spaces
* | | Merge branch 'master' into fix-core-dump-sharedGennadiy Civil2017-12-081-0/+2
|\ \ \ | | |/ | |/|
| * | Improved description of VS std::tuple supportWojciech Mamrak2017-12-071-0/+2
| |/
* / Fix double free when building Gtest/GMock in shared libraries and linking a ↵Romain Geissler2017-12-021-23/+40
|/ | | | test executable with both.
* CMake: use threads if allowed and found, not just if found.Roman Lebedev2017-09-011-1/+1
| | | | | | | | | | | | | | | | | | If the user's cmakelists.txt first look for threads using find_package(Threads), then set(gtest_disable_pthreads ON), and then include googletest. GoogleTest will not look for threads. But since they have already been found before in user's cmakelists, it will use them regardless. This helped me fix build issue in darktable-org/rawspeed on windows/MSYS2, even though there are threads, and they are usable, googletest build was failing with issues about AutoHandle. I was first looking for threads, and only then including googletest, so no matter the value of gtest_disable_pthreads, it failed. The other obvious solution is for user to first include googletest, and only then look for threads by himself.
* Add support for pkgconfigDavid Seifert2017-08-141-1/+18
|
* Merge pull request #1160 from mwoehlke-kitware/honor-lib_suffixGennadiy Civil2017-08-111-4/+8
|\ | | | | Fix library install destinations
| * Fix library install destinationsMatthew Woehlke2017-08-091-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify library install destinations to install .dll's to the correct location (`bin`, not `lib`), and to install other artifacts to the correct platform-dependent location by using GNUInstallDirs. This is required for some distributions (e.g. Fedora) and will fix an issue that otherwise requires those distributions to patch the upstream sources. Also, add options to suppress installation, which may be useful for projects that embed Google Test. Since Google Test is trying to support archaic versions of CMake, a brain-dead fallback (which requires that the user set either LIB_SUFFIX or CMAKE_INSTALL_LIBDIR themselves) is included for versions that predate GNUInstallDirs. Fixes #1161. Co-Authored-By: d3x0r <d3x0r@users.noreply.github.com>
* | 2.6.4 is the minimum CMake version, so enforce it (#656)Craig Scott2016-12-171-1/+1
|/
* Merge pull request #657 from audiofanatic/issue655-targetHeaderDepsBilly Donahue2015-12-101-0/+8
|\ | | | | Add include dirs to targets if CMake version supports it
| * Add include dirs to targets if CMake version supports itCraig Scott2015-12-061-0/+8
| |
* | Added CMake install rules for GMockJoan Puigcerver2015-12-031-0/+8
|/
* googlemock: fix unified buildArnaud Lacombe2015-08-261-1/+1
|
* move googlemock files into googlemock/ subdirBilly Donahue2015-08-251-0/+186