1 files changed, 31 insertions, 60 deletions
diff --git a/flow/gsl/CMakeLists.txt b/flow/gsl/CMakeLists.txt
index 7c880ee..952311b 100644
--- a/flow/gsl/CMakeLists.txt
+++ b/flow/gsl/CMakeLists.txt
@@ -103,61 +103,7 @@ set( GSL_USE_ARTS_THREADS 1 )
 configure_file( gslconfig.h.in gslconfig.h @ONLY )
 
 
-##### compile ###################################
-
-set( gsl_INCS
-  ${CMAKE_CURRENT_BINARY_DIR}/gslconfig.h
-  gslcommon.h
-  gsldatacache.h
-  gsldatahandle.h
-  gsldefs.h
-  gslloader.h
-  gslmath.h
-  gslfilter.h
-  gsldatautils.h
-  gsldatahandle-vorbis.h
-  gslconvert.h
-  gslfft.h
-  gslieee754.h
-  gslsignal.h
-  gslmagic.h
-  gslengine.h
-  gslwaveosc.h
-  gslwavechunk.h
-  gsldatahandle-mad.h
-  gslosctable.h
-  gsloscillator.h
-)
-
-set( gsl_SRCS
-  gsldatacache.c
-  gsldatahandle.c
-  gslwavechunk.c
-  gsldatahandle-vorbis.c
-  gslmath.c
-  gslfilter.c
-  gslcommon.c
-  gsldatautils.c
-  gslmagic.c
-  gslloader-wav.c
-  gslloader-gslwave.c
-  gslloader-mad.c
-  gslloader-oggvorbis.c
-  gslconvert.c
-  gslfft.c
-  gslsignal.c
-  gslloader.c
-  gslwaveosc.c
-  gslengine.c
-  gsloputil.c
-  gslopmaster.c
-  gslopschedule.c
-  gsldatahandle-mad.c
-  gslosctable.c
-  gsloscillator.c
-  gslfilehash.c
-  gslartsthreads.cc
-)
+##### include paths #############################
 
 include_directories(
   ${CMAKE_BINARY_DIR}
@@ -168,12 +114,37 @@ include_directories(
   ${GLIB2_INCLUDE_DIRS}
 )
 
-add_library( gsl STATIC ${gsl_SRCS} )
-set_target_properties( gsl PROPERTIES COMPILE_FLAGS -fPIC )
-target_link_libraries( gsl ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${VORBISFILE_LIBRARIES} ${MAD_LIBRARIES} )
+
+##### headers ###################################
+
+install( FILES
+    gslcommon.h gsldatacache.h gsldatahandle.h
+    gsldefs.h gslloader.h gslmath.h gslfilter.h
+    gsldatautils.h gsldatahandle-vorbis.h gslconvert.h
+    gslfft.h gslieee754.h gslsignal.h gslmagic.h
+    gslengine.h gslwaveosc.h gslwavechunk.h
+    gsldatahandle-mad.h gslosctable.h gsloscillator.h
+    ${CMAKE_CURRENT_BINARY_DIR}/gslconfig.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/gsl )
 
 
-##### install ###################################
+##### gsl (static lib) ##########################
 
-install( FILES ${gsl_INCS} DESTINATION ${INCLUDE_INSTALL_DIR}/gsl )
+set( target gsl )
+
+set( ${target}_SRCS
+  gsldatacache.c gsldatahandle.c gslwavechunk.c
+  gsldatahandle-vorbis.c gslmath.c gslfilter.c
+  gslcommon.c gsldatautils.c gslmagic.c gslloader-wav.c
+  gslloader-gslwave.c gslloader-mad.c gslloader-oggvorbis.c
+  gslconvert.c gslfft.c gslsignal.c gslloader.c
+  gslwaveosc.c gslengine.c gsloputil.c gslopmaster.c
+  gslopschedule.c gsldatahandle-mad.c gslosctable.c
+  gsloscillator.c gslfilehash.c gslartsthreads.cc
+)
+
+tde_add_library( ${target} STATIC_PIC
+  SOURCES ${${target}_SRCS}
+  LINK ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${VORBISFILE_LIBRARIES} ${MAD_LIBRARIES}
+)