Use system GSL if we have it

kdm9 · Oct 21, 2015 · 577fdab · 577fdab
1 parent 83c58e7
commit 577fdab
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,7 +29,15 @@ MESSAGE(STATUS "${CMAKE_BUILD_TYPE} build of axe version: ${AXE_VERSION}")
 ## Find Packages and Headers ##
 ###############################
 
-# Done by libqes' CML.txt
+FIND_PACKAGE(ZLIB 1.2.5 REQUIRED)
+
+FIND_PACKAGE(GSL)
+
+IF (GSL_FOUND)
+    SET(AXE_DEP_INCLUDES ${GSL_INCLUDE_DIRS})
+    SET(AXE_DEP_LIBS ${GSL_LIBRARIES})
+ENDIF()
+
 
 ##########################
 ## Set Compiler Options ##

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -16,10 +16,15 @@
 # Axe library (libaxe.a)
 FILE(GLOB DATRIE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/datrie/*.c)
 FILE(GLOB GSL_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/gsl/*.c)
-SET(AXELIB_SRCS ${DATRIE_SRCS} ${GSL_SRCS} axe.c)
+SET(AXELIB_SRCS ${DATRIE_SRCS} axe.c)
+
+IF (NOT GSL_FOUND)
+    MESSAGE(STATUS "Using bundled GSL sources")
+    SET(AXELIB_SRCS ${AXELIB_SRCS} ${GSL_SRCS})
+ENDIF()
 
 ADD_LIBRARY(axelib STATIC ${AXELIB_SRCS})
-TARGET_LINK_LIBRARIES(axelib qes_static)
+TARGET_LINK_LIBRARIES(axelib qes_static ${AXE_DEP_LIBS})
 SET_TARGET_PROPERTIES(axelib PROPERTIES OUTPUT_NAME axe)
 
 # Executable