hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'develop' into oldcmake2

Browse Source
This commit is contained in:
Sebastian Messmer 2016-02-12 10:17:22 +01:00
commit cbbe6448c4
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vendor/gitversion/gitversion-1.9/cmake.cmake vendored
View File

@ -18,7 +18,6 @@ function(_SET_GITVERSION_CMAKE_VARIABLE OUTPUT_VARIABLE)
STRING(REGEX REPLACE ".*VERSION_STRING = \"([^\"]*)\".*" "\\1" VERSION_STRING "${VERSION_H_FILE_CONTENT}") STRING(REGEX REPLACE ".*VERSION_STRING = \"([^\"]*)\".*" "\\1" VERSION_STRING "${VERSION_H_FILE_CONTENT}")
MESSAGE(STATUS "Version from git: ${VERSION_STRING}") MESSAGE(STATUS "Version from git: ${VERSION_STRING}")
SET(${OUTPUT_VARIABLE} "${VERSION_STRING}" CACHE INTERNAL "${OUTPUT_VARIABLE}") SET(${OUTPUT_VARIABLE} "${VERSION_STRING}" CACHE INTERNAL "${OUTPUT_VARIABLE}")
MESSAGE(STATUS "Output: ${OUTPUT_VARIABLE}: ${${OUTPUT_VARIABLE}}")
endfunction(_SET_GITVERSION_CMAKE_VARIABLE) endfunction(_SET_GITVERSION_CMAKE_VARIABLE)
###################################################### ######################################################

3
vendor/googletest/CMakeLists.txt vendored
View File

@ -1,6 +1,9 @@
include(CTest) include(CTest)
if (BUILD_TESTING) if (BUILD_TESTING)
function(install)
# Do nothing. Disable cmake install() commands in googletest.
endfunction()
add_subdirectory(gtest-1.7.0) add_subdirectory(gtest-1.7.0)
project (googletest) project (googletest)