From 01f65b2f85917b4880a1436a8b4142bd0d21d6db Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Mon, 23 Mar 2020 12:38:32 +0100
Subject: [PATCH] Remove logog related code from cmake.
---
scripts/cmake/Find.cmake | 9 ---------
scripts/cmake/test/CTestCustom.cmake.in | 2 --
scripts/cmake/test/Test.cmake | 7 -------
3 files changed, 18 deletions(-)
delete mode 100644 scripts/cmake/test/CTestCustom.cmake.in
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index cb5970458c4..8ce9cf7ad9f 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -73,15 +73,6 @@ include(${VTK_USE_FILE})
find_package(Eigen3 ${ogs.minimum_version.eigen} REQUIRED)
include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR})
-## pthread, is a requirement of logog ##
-set(CMAKE_THREAD_PREFER_PTHREAD ON)
-set(THREADS_PREFER_PTHREAD_FLAG ON)
-find_package(Threads REQUIRED)
-if(CMAKE_USE_PTHREADS_INIT)
- set(HAVE_PTHREADS TRUE)
- add_definitions(-DHAVE_PTHREADS)
-endif()
-
# Do not search for libs if this option is set
if(OGS_NO_EXTERNAL_LIBS)
return()
diff --git a/scripts/cmake/test/CTestCustom.cmake.in b/scripts/cmake/test/CTestCustom.cmake.in
deleted file mode 100644
index 14e2ef03447..00000000000
--- a/scripts/cmake/test/CTestCustom.cmake.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# set(CTEST_CUSTOM_POST_TEST "cat ${CMAKE_BINARY_DIR}/Testing/Temporary/LastTestTester.log 2>&1")
-set(CTEST_CUSTOM_TESTS_IGNORE ${CTEST_CUSTOM_TESTS_IGNORE}) # logog
diff --git a/scripts/cmake/test/Test.cmake b/scripts/cmake/test/Test.cmake
index ef0c582d606..e125f69ab43 100644
--- a/scripts/cmake/test/Test.cmake
+++ b/scripts/cmake/test/Test.cmake
@@ -27,13 +27,6 @@ endif()
enable_testing() # Enable CTest
-# See http://www.vtk.org/Wiki/CMake/Testing_With_CTest for some customization options
-set(CTEST_CUSTOM_TESTS_IGNORE test-harness) # ignore logog test
-configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/test/CTestCustom.cmake.in
- ${PROJECT_BINARY_DIR}/CTestCustom.cmake
-)
-
include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/test/AddTest.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/test/MeshTest.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/test/OgsTest.cmake)
--
GitLab