Skip to content

Commit 5851bb3

Browse files
authored
Merge pull request #9 from sfarrens/master
Add conditions for undefined cfitsio variables
2 parents 598c146 + d3133fd commit 5851bb3

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ sudo: false
99
before_install:
1010
- sudo apt-get -qq update
1111
- sudo apt-get install -y libcfitsio3-dev
12-
12+
1313
install:
1414
- mkdir build
1515
- cd build

CMakeLists.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ project(sparse2d)
2525

2626
# Locate CFITSIO using pkg-config or use command line arguments to configure
2727
# CFITSIO
28-
if(CFITSIO_LIBRARIES STREQUAL "" OR CFITSIO_LIBRARY_DIRS STREQUAL "" OR
29-
CFITSIO_INCLUDE_DIRS STREQUAL "")
28+
if(CFITSIO_LIBRARIES STREQUAL "" OR NOT DEFINED CFITSIO_LIBRARIES OR
29+
CFITSIO_LIBRARY_DIRS STREQUAL "" OR NOT DEFINED CFITSIO_LIBRARY_DIRS OR
30+
CFITSIO_INCLUDE_DIRS STREQUAL "" OR NOT DEFINED CFITSIO_INCLUDE_DIRS)
3031
pkg_check_modules(CFITSIO REQUIRED cfitsio)
3132
else()
3233
message(STATUS "Use manually configured cfitsio")

0 commit comments

Comments
 (0)