From 00ee0d4bcda5dc69317c8d8db4c901402ad95fc5 Mon Sep 17 00:00:00 2001 From: Hleb Valoshka <375gnu@gmail.com> Date: Sat, 2 Nov 2019 00:47:43 +0300 Subject: [PATCH] [cmake] Update for vcpkg-provided cspice --- CMakeLists.txt | 2 ++ cmake/FindCspice.cmake | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c49068a..a833415c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,6 +122,8 @@ if(ENABLE_SPICE) include_directories(${SPICE_INCLUDE_DIR}) message(STATUS "Spice include directories: ${SPICE_INCLUDE_DIR}") add_library(CSPICE::CSPICE ALIAS Spice) + else() + include_directories(${CSPICE_INCLUDE_DIR}) endif() add_definitions(-DUSE_SPICE) endif() diff --git a/cmake/FindCspice.cmake b/cmake/FindCspice.cmake index 16168c27..fac2cacd 100644 --- a/cmake/FindCspice.cmake +++ b/cmake/FindCspice.cmake @@ -21,13 +21,16 @@ # Find include directory find_path(CSPICE_INCLUDE_DIR - NAMES "SpiceOsc.h" + NAMES "SpiceUsr.h" + HINTS CSPICE_DIR + PATH_SUFFIXES "include" "include/cspice" DOC "cspice include directory") mark_as_advanced(CSPICE_INCLUDE_DIR) # Find CSPICE library find_library(CSPICE_LIBRARY NAMES "cspice" "libcspice" "cspice.a" + HINTS CSPICE_DIR DOC "cspice libraries") mark_as_advanced(CSPICE_LIBRARY)