055702ad13
Add BuildRequires on lz4-devel and xxhash-devel Workaround for missing gmock libraries only needed for gmock < 0.1.8 Address some warnings during documentation generation
82 lines
3.4 KiB
Diff
82 lines
3.4 KiB
Diff
diff -ur root-6.10.08.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.10.08/cmake/modules/SearchInstalledSoftware.cmake
|
|
--- root-6.10.08.orig/cmake/modules/SearchInstalledSoftware.cmake 2017-10-16 18:28:58.000000000 +0200
|
|
+++ root-6.10.08/cmake/modules/SearchInstalledSoftware.cmake 2017-10-19 21:18:23.053801458 +0200
|
|
@@ -1511,74 +1511,19 @@
|
|
|
|
#---Download googletest--------------------------------------------------------------
|
|
if (testing)
|
|
- # FIXME: Remove our version of gtest in roottest. We can reuse this one.
|
|
- # Add gtest
|
|
- # http://stackoverflow.com/questions/9689183/cmake-googletest
|
|
-
|
|
- set(_byproduct_binary_dir
|
|
- ${CMAKE_CURRENT_BINARY_DIR}/googletest-prefix/src/googletest-build/googlemock/)
|
|
- set(_byproducts
|
|
- ${_byproduct_binary_dir}/gtest/libgtest.a
|
|
- ${_byproduct_binary_dir}/gtest/libgtest_main.a
|
|
- ${_byproduct_binary_dir}/libgmock.a
|
|
- ${_byproduct_binary_dir}/libgmock_main.a
|
|
- )
|
|
-
|
|
- ExternalProject_Add(
|
|
- googletest
|
|
- GIT_REPOSITORY https://github.com/google/googletest.git
|
|
- GIT_TAG release-1.8.0
|
|
- UPDATE_COMMAND ""
|
|
- # TIMEOUT 10
|
|
- # # Force separate output paths for debug and release builds to allow easy
|
|
- # # identification of correct lib in subsequent TARGET_LINK_LIBRARIES commands
|
|
- # CMAKE_ARGS -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=DebugLibs
|
|
- # -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=ReleaseLibs
|
|
- # -Dgtest_force_shared_crt=ON
|
|
- CMAKE_ARGS -G ${CMAKE_GENERATOR}
|
|
- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
|
|
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
|
|
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
|
|
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
|
|
- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
|
|
- -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
|
|
- # Disable install step
|
|
- INSTALL_COMMAND ""
|
|
- BUILD_BYPRODUCTS ${_byproducts}
|
|
- # Wrap download, configure and build steps in a script to log output
|
|
- LOG_DOWNLOAD ON
|
|
- LOG_CONFIGURE ON
|
|
- LOG_BUILD ON)
|
|
-
|
|
- # Specify include dirs for gtest and gmock
|
|
- ExternalProject_Get_Property(googletest source_dir)
|
|
- set(GTEST_INCLUDE_DIR ${source_dir}/googletest/include)
|
|
- set(GMOCK_INCLUDE_DIR ${source_dir}/googlemock/include)
|
|
-
|
|
- # Libraries
|
|
- ExternalProject_Get_Property(googletest binary_dir)
|
|
- set(_G_LIBRARY_PATH ${binary_dir}/googlemock/)
|
|
-
|
|
- # gtest
|
|
- add_library(gtest IMPORTED STATIC GLOBAL)
|
|
- set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/gtest/libgtest.a)
|
|
- add_dependencies(gtest googletest)
|
|
-
|
|
- # gtest_main
|
|
- add_library(gtest_main IMPORTED STATIC GLOBAL)
|
|
- set_property(TARGET gtest_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/gtest/libgtest_main.a)
|
|
- add_dependencies(gtest_main googletest)
|
|
+ # Workaround for missing libraries in Fedora's gmock packaging < 1.8.0
|
|
+ if(EXISTS ${CMAKE_SOURCE_DIR}/googlemock)
|
|
+ set(_G_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/googlemock)
|
|
|
|
# gmock
|
|
add_library(gmock IMPORTED STATIC GLOBAL)
|
|
set_property(TARGET gmock PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/libgmock.a)
|
|
- add_dependencies(gmock googletest)
|
|
|
|
# gmock_main
|
|
add_library(gmock_main IMPORTED STATIC GLOBAL)
|
|
set_property(TARGET gmock_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/libgmock_main.a)
|
|
- add_dependencies(gmock_main googletest)
|
|
|
|
+ endif()
|
|
endif()
|
|
|
|
#---Report non implemented options---------------------------------------------------
|