diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-29 04:21:57 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-29 04:21:57 +0000 |
| commit | c21d34f250a978f92f6e0e7c2c27be9b6dde90f7 (patch) | |
| tree | e82ea9d4a7c5c3141cea004c5bfebaedf90aa245 | |
| parent | 42e5e6e537d42a42cde9c0b5ce7e6d41b4db784c (diff) | |
| download | arts-c21d34f250a978f92f6e0e7c2c27be9b6dde90f7.tar.gz arts-c21d34f250a978f92f6e0e7c2c27be9b6dde90f7.zip | |
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
| -rw-r--r-- | flow/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | flow/gsl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | 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 |