summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-03-26 12:24:19 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-03-26 12:24:19 -0700
commit0a4444930e92a657c41b8dca59b728169f607ced (patch)
tree024e345b06c3c5eed9ea8b85b98842cbe59bff63
parent4309ab4a16082963872e2bd5240e1c8bf6f4dddf (diff)
downloadsubsurface-0a4444930e92a657c41b8dca59b728169f607ced.tar.gz
cmake: use DEFINED instead of comparing to ""
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 941e4bc20..51573cd75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ if(NOT DEFINED LIBGIT2DEVEL)
ELSE()
include_directories(${LIBGIT2DEVEL}/include)
link_directories(${LIBGIT2DEVEL}/build)
- if(LIBGIT2STATIC STREQUAL "")
+ if(NOT DEFINED LIBGIT2STATIC)
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -lgit2 -lssl -lcrypto)
ELSE()
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} libgit2.a -lssl -lcrypto)
@@ -41,8 +41,8 @@ IF(DEFINED LIBDCDEVEL)
cmake_policy(SET CMP0015 OLD)
include_directories(${LIBDCDEVEL}/include )
link_directories(${LIBDCDEVEL}/src/.libs)
- if(LIBDCSTATIC STREQUAL "")
- set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -ldivecomputer)
+ if(NOT DEFINED LIBDCSTATIC)
+ set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -ldivecomputer -lusb-1.0)
ELSE()
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} libdivecomputer.a -lusb-1.0)
ENDIF()