[med-svn] [Git][med-team/xenium][master] Compiling googltest - not using it.

[Steffen Möller]

Steffen Möller pushed to branch master at Debian Med / xenium


Commits:
d7809e74 by Steffen Möller at 2020-07-20T22:16:34+02:00
Compiling googltest - not using it.

- - - - -


2 changed files:

- debian/patches/AdjustCMake.patch
- debian/rules


Changes:

=====================================
debian/patches/AdjustCMake.patch
=====================================
@@ -2,13 +2,7 @@ Index: xenium/CMakeLists.txt
 ===================================================================
 --- xenium.orig/CMakeLists.txt
 +++ xenium/CMakeLists.txt
-@@ -1,12 +1,12 @@
- project(xenium)
- cmake_minimum_required(VERSION 3.0)
- 
--include(gtest.cmake)
-+#include(gtest.cmake)
- 
+@@ -6,7 +6,7 @@ include(gtest.cmake)
  set(CMAKE_CXX_STANDARD 17)
  set(CMAKE_CXX_STANDARD_REQUIRED ON)
  
@@ -72,3 +66,26 @@ Index: xenium/CMakeLists.txt
  
 -add_test(AllTests gtest)
 +#add_test(AllTests gtest)
+Index: xenium/gtest.cmake
+===================================================================
+--- xenium.orig/gtest.cmake
++++ xenium/gtest.cmake
+@@ -1,13 +1,13 @@
+-set(GOOGLETEST_ROOT gtest/googletest CACHE STRING "Google Test source root")
++set(GOOGLETEST_ROOT /usr/src/googletest/googletest/ CACHE STRING "Google Test source root")
+ 
+ include_directories(SYSTEM
+-    ${PROJECT_SOURCE_DIR}/${GOOGLETEST_ROOT}
+-    ${PROJECT_SOURCE_DIR}/${GOOGLETEST_ROOT}/include
++    ${GOOGLETEST_ROOT}
++    ${GOOGLETEST_ROOT}/include
+     )
+ 
+ set(GOOGLETEST_SOURCES
+-    ${PROJECT_SOURCE_DIR}/${GOOGLETEST_ROOT}/src/gtest-all.cc
+-    ${PROJECT_SOURCE_DIR}/${GOOGLETEST_ROOT}/src/gtest_main.cc
++    ${GOOGLETEST_ROOT}/src/gtest-all.cc
++    ${GOOGLETEST_ROOT}/src/gtest_main.cc
+     )
+ 
+ foreach(_source ${GOOGLETEST_SOURCES})


=====================================
debian/rules
=====================================
@@ -8,7 +8,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_BUILD_TYPE="RelWithDebug" # -DWITH_LIBCDS="1"
+	dh_auto_configure -- -DCMAKE_BUILD_TYPE="RelWithDebug" -DCMAKE_CXX_FLAGS="-fsanitize=thread" # -DWITH_LIBCDS="1"
 
 override_dh_auto_build:
 	dh_auto_build



View it on GitLab: https://salsa.debian.org/med-team/xenium/-/commit/d7809e745df83b238b7f6b0edc471b1f21c5b41b

-- 
View it on GitLab: https://salsa.debian.org/med-team/xenium/-/commit/d7809e745df83b238b7f6b0edc471b1f21c5b41b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200720/a5440bc3/attachment-0001.html>