From 99c9f742e20595a3092b569a8d44cb7116d21318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20K=C3=B6nig?= Date: Fri, 23 Sep 2016 11:57:41 +0200 Subject: [PATCH] No longer link with libpython.so to fix #18 --- CHANGELOG.md | 6 ++++++ cpp/turbodbc/Library/CMakeLists.txt | 1 - cpp/turbodbc/Test/CMakeLists.txt | 5 +++-- cpp/turbodbc_numpy/Library/CMakeLists.txt | 1 - cpp/turbodbc_python/Library/CMakeLists.txt | 1 - 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76c4c9b2..e55be410 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Version 0.4.1 +============= + +* Libraries no longer link `libpython.so` (linking is already done by + the Python interpreter) + Version 0.4.0 ============= diff --git a/cpp/turbodbc/Library/CMakeLists.txt b/cpp/turbodbc/Library/CMakeLists.txt index 45c2ef12..f04619e2 100644 --- a/cpp/turbodbc/Library/CMakeLists.txt +++ b/cpp/turbodbc/Library/CMakeLists.txt @@ -13,7 +13,6 @@ add_dependencies(turbodbc target_link_libraries(turbodbc ${Boost_LIBRARIES} ${Odbc_LIBRARIES} - ${PYTHON_LIBRARIES} cpp_odbc ) diff --git a/cpp/turbodbc/Test/CMakeLists.txt b/cpp/turbodbc/Test/CMakeLists.txt index 7450cc9b..75225869 100644 --- a/cpp/turbodbc/Test/CMakeLists.txt +++ b/cpp/turbodbc/Test/CMakeLists.txt @@ -14,9 +14,10 @@ add_dependencies(turbodbc_test ) target_link_libraries(turbodbc_test - turbodbc - cpp_odbc + turbodbc + cpp_odbc ${Odbc_LIBRARIES} + ${PYTHON_LIBRARIES} gmock_main gtest gmock diff --git a/cpp/turbodbc_numpy/Library/CMakeLists.txt b/cpp/turbodbc_numpy/Library/CMakeLists.txt index 9fc5b7c7..13af8b3b 100644 --- a/cpp/turbodbc_numpy/Library/CMakeLists.txt +++ b/cpp/turbodbc_numpy/Library/CMakeLists.txt @@ -14,7 +14,6 @@ add_dependencies(turbodbc_numpy_support target_link_libraries(turbodbc_numpy_support ${Boost_LIBRARIES} ${Odbc_LIBRARIES} - ${PYTHON_LIBRARIES} cpp_odbc turbodbc ) diff --git a/cpp/turbodbc_python/Library/CMakeLists.txt b/cpp/turbodbc_python/Library/CMakeLists.txt index 01e6b5c1..09f3ac8a 100644 --- a/cpp/turbodbc_python/Library/CMakeLists.txt +++ b/cpp/turbodbc_python/Library/CMakeLists.txt @@ -15,7 +15,6 @@ add_dependencies(turbodbc_python target_link_libraries(turbodbc_python ${Boost_LIBRARIES} ${Odbc_LIBRARIES} - ${PYTHON_LIBRARIES} cpp_odbc turbodbc )