Merge pull request #28 from NOAA-EMC/ejh_cmake_fix

cmake fix - now check for sp library at top level
NOAA-EMC · Oct 5, 2020 · 99ce100 · 99ce100
2 parents 9473971 + c32cc85
commit 99ce100
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,3 +1,6 @@
+# This is the main CMake file for NCEPLIBS-ip.
+
+# Mark Potts, Kyle Gerheiser
 cmake_minimum_required(VERSION 3.15)
 
 file(STRINGS "VERSION" pVersion)
@@ -28,6 +31,9 @@ if(OPENMP)
   find_package(OpenMP REQUIRED COMPONENTS Fortran)
 endif()
 
+# The NCEPLIBS-sp library is required.
+find_package(sp REQUIRED)
+
 add_subdirectory(src)
 
 if (ENABLE_TESTS)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -2,8 +2,6 @@
 
 file(COPY data/ DESTINATION data)
 
-find_package(sp REQUIRED)
-
 add_pfunit_ctest (interp_test
   TEST_SOURCES test_mod.pf
   LINK_LIBRARIES ip::ip_4 sp::sp_4