Browse Source

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
tags/v3.5.13
tpearson 9 years ago
parent
commit
c21d34f250
3 changed files with 3 additions and 3 deletions
  1. +1
    -1
      flow/CMakeLists.txt
  2. +1
    -1
      flow/gsl/CMakeLists.txt
  3. +1
    -1
      flow/gslpp/CMakeLists.txt

+ 1
- 1
flow/CMakeLists.txt View File

@@ -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}
)



+ 1
- 1
flow/gsl/CMakeLists.txt View File

@@ -134,7 +134,7 @@ install( FILES

##### gsl (static lib) ##########################

set( target gsl )
set( target artsgsl )

set( ${target}_SRCS
gsldatacache.c gsldatahandle.c gslwavechunk.c


+ 1
- 1
flow/gslpp/CMakeLists.txt View File

@@ -19,7 +19,7 @@ include_directories(

##### gslpp (static lib) ########################

set( target gslpp )
set( target artsgslpp )

tde_add_library( ${target} STATIC_PIC
SOURCES datahandle.cpp


Loading…
Cancel
Save