diff options
| author |   Craig Andrews <candrews@gentoo.org> | 2020-12-28 11:43:33 -0500 |
|---|---|---|
| committer | Craig Andrews <candrews@gentoo.org> | 2020-12-28 11:43:56 -0500 |
| commit | cf938e7183d49f0da60052ddc884bc99643a49cc (patch) | |
| tree | f41267cae01e06bec7bf33526457411f52544a25 /dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch | |
| parent | dev-libs/libzia: Support libftdi:1 (diff) | |
| download | gentoo-cf938e7183d49f0da60052ddc884bc99643a49cc.tar.gz gentoo-cf938e7183d49f0da60052ddc884bc99643a49cc.tar.bz2 gentoo-cf938e7183d49f0da60052ddc884bc99643a49cc.zip | |
dev-libs/rapidjson: Drop dependency on valgrind; remove -march=native
Closes: https://bugs.gentoo.org/760881
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Craig Andrews <candrews@gentoo.org>
Diffstat (limited to 'dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch')
| -rw-r--r-- | dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch b/dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch new file mode 100644 index 000000000000..bdc720e8cf86 --- /dev/null +++ b/dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch @@ -0,0 +1,44 @@ +--- /CMakeModules/FindGTestSrc.cmake ++++ /CMakeModules/FindGTestSrc.cmake +@@ -1,30 +1,9 @@ +- +-SET(GTEST_SEARCH_PATH +- "${GTEST_SOURCE_DIR}" +- "${CMAKE_CURRENT_LIST_DIR}/../thirdparty/gtest/googletest") +- +-IF(UNIX) +- IF(RAPIDJSON_BUILD_THIRDPARTY_GTEST) +- LIST(APPEND GTEST_SEARCH_PATH "/usr/src/gtest") +- ELSE() +- LIST(INSERT GTEST_SEARCH_PATH 1 "/usr/src/gtest") +- ENDIF() +-ENDIF() +- +-FIND_PATH(GTEST_SOURCE_DIR +- NAMES CMakeLists.txt src/gtest_main.cc +- PATHS ${GTEST_SEARCH_PATH}) +- +- + # Debian installs gtest include directory in /usr/include, thus need to look + # for include directory separately from source directory. + FIND_PATH(GTEST_INCLUDE_DIR + NAMES gtest/gtest.h +- PATH_SUFFIXES include +- HINTS ${GTEST_SOURCE_DIR} +- PATHS ${GTEST_SEARCH_PATH}) ++ PATH_SUFFIXES include) + + INCLUDE(FindPackageHandleStandardArgs) + find_package_handle_standard_args(GTestSrc DEFAULT_MSG +- GTEST_SOURCE_DIR + GTEST_INCLUDE_DIR) +--- /test/CMakeLists.txt ++++ /test/CMakeLists.txt +@@ -8,7 +8,6 @@ + set(gtest_force_shared_crt ON) + endif() + +- add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_BINARY_DIR}/googletest) + include_directories(SYSTEM ${GTEST_INCLUDE_DIR}) + + set(TEST_LIBRARIES gtest gtest_main) |