From c21d34f250a978f92f6e0e7c2c27be9b6dde90f7 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 29 Sep 2011 04:21:57 +0000
Subject: Make arts use libartsgsl.a instead of libgsl.a to avoid conflict with
 GSL Thanks to Mario Fetka for the initial patch! Part 1/2

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/arts@1256158 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 flow/CMakeLists.txt       | 2 +-
 flow/gsl/CMakeLists.txt   | 2 +-
 flow/gslpp/CMakeLists.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/flow/CMakeLists.txt b/flow/CMakeLists.txt
index aa26352..40be36d 100644
--- a/flow/CMakeLists.txt
+++ b/flow/CMakeLists.txt
@@ -65,7 +65,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK gsl-static gslpp-static artsflow_idl-shared ${AUDIOFILE_LIBRARIES}
+  LINK artsgsl-static artsgslpp-static artsflow_idl-shared ${AUDIOFILE_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/flow/gsl/CMakeLists.txt b/flow/gsl/CMakeLists.txt
index ac72e2e..877b77c 100644
--- a/flow/gsl/CMakeLists.txt
+++ b/flow/gsl/CMakeLists.txt
@@ -134,7 +134,7 @@ install( FILES
 
 ##### gsl (static lib) ##########################
 
-set( target gsl )
+set( target artsgsl )
 
 set( ${target}_SRCS
   gsldatacache.c gsldatahandle.c gslwavechunk.c
diff --git a/flow/gslpp/CMakeLists.txt b/flow/gslpp/CMakeLists.txt
index cd8576c..dd270cb 100644
--- a/flow/gslpp/CMakeLists.txt
+++ b/flow/gslpp/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
 
 ##### gslpp (static lib) ########################
 
-set( target gslpp )
+set( target artsgslpp )
 
 tde_add_library( ${target} STATIC_PIC
   SOURCES datahandle.cpp
-- 
cgit v1.2.3