From c32cc857a22d4e067bdb1e4f832207ef6b457669 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Thu, 1 Oct 2020 09:58:12 -0600 Subject: [PATCH] move check for sp library to top level makefile --- CMakeLists.txt | 6 ++++++ tests/CMakeLists.txt | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a8ee300b..30531377 100644 --- 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 index d579d994..5e14b206 100644 --- 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