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
v3.5.13-sru
tpearson 13 years ago
parent 42e5e6e537
commit c21d34f250

@ -65,7 +65,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED tde_add_library( ${target} SHARED
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
VERSION 1.0.0 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} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -134,7 +134,7 @@ install( FILES
##### gsl (static lib) ########################## ##### gsl (static lib) ##########################
set( target gsl ) set( target artsgsl )
set( ${target}_SRCS set( ${target}_SRCS
gsldatacache.c gsldatahandle.c gslwavechunk.c gsldatacache.c gsldatahandle.c gslwavechunk.c

@ -19,7 +19,7 @@ include_directories(
##### gslpp (static lib) ######################## ##### gslpp (static lib) ########################
set( target gslpp ) set( target artsgslpp )
tde_add_library( ${target} STATIC_PIC tde_add_library( ${target} STATIC_PIC
SOURCES datahandle.cpp SOURCES datahandle.cpp

Loading…
Cancel
Save