switch from git submodule gtest to linked gtest, update spack.yaml

Author: Chrismarsh

CMakeLists.txt

@@ -124,6 +124,9 @@ endmacro()
 # ---------------------------------------------------------------
 # ------ Start of find_package section --------------------------
 # ---------------------------------------------------------------
+if(BUILD_TESTS)
+    find_package(GTest CONFIG REQUIRED)
+endif(BUILD_TESTS)
 
 # Need to check for MPI before building external libraries
 find_package(MPI REQUIRED COMPONENTS C CXX Fortran REQUIRED) # MPI_C is needed for the mpi that HDF can bring in
@@ -245,8 +248,6 @@ find_package(Eigen3 REQUIRED NO_MODULE)
 set(BLA_VENDOR OpenBLAS)
 find_package(BLAS REQUIRED)
 
-
-
 find_package(Sparsehash)
 if( Sparsehash_FOUND )
     add_definitions(-DUSE_SPARSEHASH)

spack.yaml

@@ -31,6 +31,7 @@ spack:
     - "cmake@3.30:"
     - "openmpi"
     - "vtk@9.3:"
+    - "googletest"
     # - "gcc@14"
   #  - udunits
   view:

src/CMakeLists.txt

@@ -394,7 +394,6 @@ endif()
 
 if (BUILD_TESTS)
 	message(STATUS "Tests enabled. Run with make check")
-	add_subdirectory (tests/googletest/googletest)
 
 	set(TEST_SRCS
 			tests/test_station.cpp
@@ -409,15 +408,12 @@ if (BUILD_TESTS)
 			#    test_daily.cpp
             tests/test_triangulation.cpp
 			tests/main.cpp
-)
-
+    )
 
-	set( GTEST_LINK
-			gtest
+	set(GTEST_LINK
+			GTest::gtest
 			)
 
-
-
 	add_executable(
 			runUnitTests
 			${CHM_SRCS}
@@ -455,32 +451,6 @@ if (BUILD_TESTS)
 						DEPENDS runUnitTests
 						WORKING_DIRECTORY ${TEST_DIR})
 
-	if(BUILD_WITH_CONAN)
-		if(APPLE)
-			add_custom_command(TARGET runUnitTests POST_BUILD
-					#patch CHM to look for @rpath/ for all dylibs that aren't looking for @rpath
-					COMMAND bash -c "otool -l ${TEST_DIR}/runUnitTests | grep name | grep -v segname |  grep -v sectname | grep -v @rpath  | awk '{print $2}' | grep -v '^/' | while read x; do install_name_tool -change $x @rpath/`echo $x | grep -Eo '[a-zA-Z0-9_\.-]+\.dylib'` ${TEST_DIR}/runUnitTests; done"
-					#strip all LC_RPATH from our non-install binary
-					COMMAND bash -c "otool -l ${TEST_DIR}/runUnitTests | grep LC_RPATH -A2 | grep path | awk '{print $2}' | while read x; do install_name_tool -delete_rpath $x ${TEST_DIR}/runUnitTests; done"
-					#update LC_RPATH for our non-install binary
-					COMMAND bash -c "install_name_tool -add_rpath @executable_path/../lib ${TEST_DIR}/runUnitTests"
-					VERBATIM)
-		else()
-			target_link_options(runUnitTests
-					PUBLIC "LINKER:--disable-new-dtags" )
-
-			add_custom_command(TARGET runUnitTests POST_BUILD
-					#			# Some .so will have runpaths, some do not. Just remove them all. The RUNPATHS override the binarie's rpath (I don't know why)
-					COMMAND bash -c "cd ${CMAKE_BINARY_DIR}/lib ; ls | while read x; do patchelf --remove-rpath $x; done"
-					#
-					#			# RPATH correctly works, so unlikely to be needed but kept just in case.
-					#			# This removes all runpaths , and then here we will patch each .so to have the correct RUNPATH
-					COMMAND bash -c "cd ${CMAKE_BINARY_DIR}/lib ; ls | while read x; do patchelf --set-rpath '\$ORIGIN/../lib' $x; done"
-
-					VERBATIM
-					)
-		endif()
-	endif()
 
 	#copy the data files from test_data to the dir that holds the test binary
 	add_custom_command(TARGET runUnitTests PRE_BUILD
@@ -490,5 +460,4 @@ if (BUILD_TESTS)
 			COMMENT "Copying files to $<TARGET_FILE_DIR:runUnitTests> from ${CMAKE_SOURCE_DIR}/test_data/")
 
 
-
 endif()

src/tests/test_core.cpp

@@ -42,7 +42,7 @@ friend class core;
 
     virtual void SetUp()
     {
-        logging::core::get()->set_logging_enabled(false);
+        // // logging::core::get()->set_logging_enabled(false);
 
 //        ASSERT_NO_THROW(c0.init(argc,argv));
     }

src/tests/test_daily.cpp

@@ -34,7 +34,7 @@ class DailyTest : public testing::Test
     virtual void SetUp()
     {
 
-        logging::core::get()->set_logging_enabled(false);
+        // logging::core::get()->set_logging_enabled(false);
 
         ASSERT_NO_THROW(ts.open("test_daily_vv_oct2010.txt"));
     }

src/tests/test_interpolation.cpp

@@ -40,7 +40,7 @@ class InterpTest : public testing::Test
 
     virtual void SetUp()
     {
-        logging::core::get()->set_logging_enabled(false);
+        // // logging::core::get()->set_logging_enabled(false);
     }
 
 };

src/tests/test_mesh.cpp

@@ -32,7 +32,7 @@ class MeshTest : public testing::Test
 
     virtual void SetUp()
     {
-        logging::core::get()->set_logging_enabled(false);
+        // logging::core::get()->set_logging_enabled(false);
         EXPECT_NO_THROW(t.from_file("tin_30mdem_30mtol_nodes.csv"));
 
     }

src/tests/test_metdata.cpp

@@ -33,7 +33,7 @@ class MetdataTest : public testing::Test
 
     virtual void SetUp()
     {
-        logging::core::get()->set_logging_enabled(false);
+        // logging::core::get()->set_logging_enabled(false);
 
     }
     std::string proj4str = "+proj=utm +zone=8 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs ";

src/tests/test_netcdf.cpp

@@ -33,7 +33,7 @@ class NetCDFTest : public testing::Test
 
     virtual void SetUp()
     {
-        logging::core::get()->set_logging_enabled(false);
+        // logging::core::get()->set_logging_enabled(false);
 
         nc.open_GEM("GEM-CHM_2p5_snowcast_2018011506_2018011605.nc");
 

src/tests/test_regexptokenizer.cpp

@@ -32,7 +32,7 @@ class RegexpTokenizerTest : public testing::Test
 
     virtual void SetUp()
     {
-        logging::core::get()->set_logging_enabled(false);
+        // logging::core::get()->set_logging_enabled(false);
     }
 
 };