diff --git a/vendor/gitversion/gitversion-1.9/cmake.cmake b/vendor/gitversion/gitversion-1.9/cmake.cmake index ee0b2da6..55ae380d 100644 --- a/vendor/gitversion/gitversion-1.9/cmake.cmake +++ b/vendor/gitversion/gitversion-1.9/cmake.cmake @@ -18,7 +18,6 @@ function(_SET_GITVERSION_CMAKE_VARIABLE OUTPUT_VARIABLE) STRING(REGEX REPLACE ".*VERSION_STRING = \"([^\"]*)\".*" "\\1" VERSION_STRING "${VERSION_H_FILE_CONTENT}") MESSAGE(STATUS "Version from git: ${VERSION_STRING}") SET(${OUTPUT_VARIABLE} "${VERSION_STRING}" CACHE INTERNAL "${OUTPUT_VARIABLE}") - MESSAGE(STATUS "Output: ${OUTPUT_VARIABLE}: ${${OUTPUT_VARIABLE}}") endfunction(_SET_GITVERSION_CMAKE_VARIABLE) ###################################################### diff --git a/vendor/googletest/CMakeLists.txt b/vendor/googletest/CMakeLists.txt index 1b7118b5..ee3d28cb 100644 --- a/vendor/googletest/CMakeLists.txt +++ b/vendor/googletest/CMakeLists.txt @@ -1,6 +1,9 @@ include(CTest) if (BUILD_TESTING) + function(install) + # Do nothing. Disable cmake install() commands in googletest. + endfunction() add_subdirectory(gtest-1.7.0) project (googletest)