mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-21 21:17:37 -08:00
06d2b112fd
- subunit & doc handling patches from #711390 - .pc libdir issue when using multilib #714058 Bug: https://bugs.gentoo.org/711390 Closes: https://bugs.gentoo.org/714058 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
24 lines
769 B
Diff
24 lines
769 B
Diff
--- a/CMakeLists.txt 2020-03-21 09:42:30.411037664 +0200
|
|
+++ b/CMakeLists.txt 2020-03-21 09:49:12.358161439 +0200
|
|
@@ -365,15 +365,16 @@
|
|
ADD_DEFINITIONS(-DHAVE_LIBRT=1)
|
|
endif (HAVE_LIBRT)
|
|
|
|
-check_library_exists(subunit subunit_test_start "" HAVE_SUBUNIT)
|
|
-if (HAVE_SUBUNIT)
|
|
+option(CHECK_ENABLE_SUBUNIT "Enable subunit support" ON)
|
|
+if (CHECK_ENABLE_SUBUNIT)
|
|
set(SUBUNIT "subunit")
|
|
set(ENABLE_SUBUNIT 1)
|
|
+ set(HAVE_SUBUNIT 1)
|
|
add_definitions(-DENABLE_SUBUNIT=1)
|
|
-else(HAVE_SUBUNIT)
|
|
+else(CHECK_ENABLE_SUBUNIT)
|
|
set(ENABLE_SUBUNIT 0)
|
|
add_definitions(-DENABLE_SUBUNIT=0)
|
|
-endif (HAVE_SUBUNIT)
|
|
+endif (CHECK_ENABLE_SUBUNIT)
|
|
|
|
###############################################################################
|
|
# Generate "config.h" from "cmake/config.h.in"
|