diff options
| author | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-06-10 06:57:53 +0000 |
|---|---|---|
| committer | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-06-10 06:57:53 +0000 |
| commit | 2b3f179e9c9e8f7d3836dc7350d34ebcc03f8326 (patch) | |
| tree | 07d53177432172f888df8be9ec0476f68aeba1cb /CMakeScripts | |
| parent | Set class attribute values of selected objects using style dialog (diff) | |
| parent | Fix make test target (diff) | |
| download | inkscape-2b3f179e9c9e8f7d3836dc7350d34ebcc03f8326.tar.gz inkscape-2b3f179e9c9e8f7d3836dc7350d34ebcc03f8326.zip | |
Merge changes from trunk
(bzr r14949.1.4)
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 0f4ba46c6..706860a00 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -274,14 +274,6 @@ else() add_definitions(-UWITH_LPETOOL -ULPE_ENABLE_TEST_EFFECTS) endif() -if(WITH_GTEST) - if(EXISTS "${GMOCK_DIR}" AND IS_DIRECTORY "${GMOCK_DIR}") - - else() - set(WITH_GTEST off) - endif() -endif() - # ---------------------------------------------------------------------------- # CMake's builtin # ---------------------------------------------------------------------------- |