Skip to content

Commit 6376161

Browse files
committed
Fixed up cmake for new cspice target
1 parent 430cb0b commit 6376161

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

isis/CMakeLists.txt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ foreach (_variableName ${_variableNames})
384384
endforeach()
385385

386386
# add target based linkages to ALLLIBS variable
387-
list(APPEND ALLLIBS pantor::inja sensorutilities protobuf::libprotobuf embree GDAL::GDAL)
387+
list(APPEND ALLLIBS pantor::inja sensorutilities protobuf::libprotobuf embree GDAL::GDAL CSPICE::cspice)
388388

389389
# Sometimes we add the same lib more than once (especially with LIBDIRS)
390390
list(REMOVE_DUPLICATES ALLLIBDIRS)
@@ -396,7 +396,7 @@ list(REMOVE_DUPLICATES ALLINCDIRS)
396396

397397

398398
get_target_property(CSPICE_INCLUDE_DIRS CSPICE::cspice INTERFACE_INCLUDE_DIRECTORIES)
399-
link_libraries(CSPICE::cspice)
399+
list(APPEND ALLLIBDIRS ${CSPICE_INCLUDE_DIRS})
400400

401401
# Start setting up the build
402402
# Add extension to find fortran until .so symlink can be added to /usr/lib64
@@ -406,10 +406,8 @@ list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES .so.3 .so.6 .so.5)
406406
include_directories(SYSTEM ${ALLINCDIRS})
407407
link_directories(${ALLLIBDIRS})
408408

409-
include_directories(
410-
${CMAKE_BINARY_DIR}/inc
411-
${CSPICE_INCLUDE_DIRS}
412-
)
409+
include_directories(${CMAKE_BINARY_DIR}/inc)
410+
413411
set(CORE_LIB_NAME isis)
414412
message(STATUS "CORE LIB: ${CORE_LIB_NAME}")
415413

0 commit comments

Comments
 (0)