From c812739d28bff26ebefb4b3a0c721c0bad7ad5f6 Mon Sep 17 00:00:00 2001 From: Casey Langen Date: Mon, 30 May 2016 11:49:02 -0700 Subject: [PATCH] Removed 3rdparty CMakeLists.txt. Just include this as part of libmusikcore. --- CMakeLists.txt | 3 --- src/3rdparty/CMakeLists.txt | 28 ---------------------- src/core/CMakeLists.txt | 5 +++- src/musikbox/app/window/CategoryListView.h | 2 +- src/musikbox/app/window/CommandWindow.h | 2 +- src/musikbox/app/window/LogWindow.h | 2 +- src/musikbox/app/window/OutputWindow.h | 2 +- src/musikbox/app/window/ResourcesWindow.h | 2 +- src/musikbox/app/window/TrackListView.h | 2 +- src/musikbox/app/window/TransportWindow.h | 2 +- 10 files changed, 11 insertions(+), 39 deletions(-) delete mode 100644 src/3rdparty/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index afb2907eb..b8ec6d69b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,8 +39,6 @@ set (musikbox_LINK_LIBS ${linux_LINK_LIBS} ${BOOST_LINK_LIBS} dl - sqlite3 - md5 ) include_directories ( @@ -50,7 +48,6 @@ include_directories ( "${musikbox_SOURCE_DIR}/src/3rdparty/include" ) -add_subdirectory(src/3rdparty) add_subdirectory(src/core) add_subdirectory(src/musikbox) add_subdirectory(src/contrib/taglib_plugin) diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt deleted file mode 100644 index bc3bc8dfa..000000000 --- a/src/3rdparty/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -if (UNIX AND NOT WIN32) - if (CMAKE_SIZEOF_VOID_P MATCHES "8") - add_definitions(-fPIC) - endif (CMAKE_SIZEOF_VOID_P MATCHES "8") -endif (UNIX AND NOT WIN32) - -set (3rdParty_MD5_SOURCES - include/md5/md5.h - src/md5/md5.c -) - -set (3rdParty_SQLITE_SOURCES - include/sqlite/sqlite3.h - include/sqlite/sqlite3ext.h - src/sqlite/sqlite3.c -) - -include_directories (include/md5) -add_library(md5 STATIC ${3rdParty_MD5_SOURCES}) - -include_directories (include/sqlite) -add_library(sqlite3 STATIC ${3rdParty_SQLITE_SOURCES}) - -if (WIN32) - add_definitions( - -DHAVE_MEMMOVE - ) -endif (WIN32) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index f24fbc7ef..7073fab32 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -26,6 +26,8 @@ set(CORE_SOURCES ./support/Preferences.cpp ./support/ThreadHelper.cpp ./support/Version.cpp + ../3rdparty/src/md5/md5.c + ../3rdparty/src/sqlite/sqlite3.c ) set (CORE_HEADERS @@ -81,10 +83,11 @@ include_directories( . .. ../3rdparty/include + ../3rdparty/include/md5 + ../3rdparty/include/sqlite ) add_definitions( - -D_CRT_SECURE_NO_DEPRECATE -D_DEBUG ) diff --git a/src/musikbox/app/window/CategoryListView.h b/src/musikbox/app/window/CategoryListView.h index 60e7694c5..e7246ec6e 100755 --- a/src/musikbox/app/window/CategoryListView.h +++ b/src/musikbox/app/window/CategoryListView.h @@ -22,7 +22,7 @@ namespace musik { namespace box { class CategoryListView : public ListWindow, -#if ( __clang_major__==7 && __clang_minor__==3 ) +#if (__clang_major__ == 7 && __clang_minor__ == 3) public std::enable_shared_from_this, #endif public sigslot::has_slots<> diff --git a/src/musikbox/app/window/CommandWindow.h b/src/musikbox/app/window/CommandWindow.h index 7b0910208..fc7b95910 100755 --- a/src/musikbox/app/window/CommandWindow.h +++ b/src/musikbox/app/window/CommandWindow.h @@ -13,7 +13,7 @@ namespace musik { class CommandWindow : public cursespp::Window, public cursespp::IInput, -#if ( __clang_major__==7 && __clang_minor__==3 ) +#if (__clang_major__ == 7 && __clang_minor__ == 3) public std::enable_shared_from_this, #endif public sigslot::has_slots<> diff --git a/src/musikbox/app/window/LogWindow.h b/src/musikbox/app/window/LogWindow.h index dd943ce9c..8ebe8d892 100755 --- a/src/musikbox/app/window/LogWindow.h +++ b/src/musikbox/app/window/LogWindow.h @@ -13,7 +13,7 @@ namespace musik { namespace box { class LogWindow : public cursespp::ScrollableWindow, -#if ( __clang_major__==7 && __clang_minor__==3 ) +#if (__clang_major__ == 7 && __clang_minor__ == 3) public std::enable_shared_from_this, #endif public sigslot::has_slots<> diff --git a/src/musikbox/app/window/OutputWindow.h b/src/musikbox/app/window/OutputWindow.h index 61eb0a2c9..2f0c34299 100755 --- a/src/musikbox/app/window/OutputWindow.h +++ b/src/musikbox/app/window/OutputWindow.h @@ -9,7 +9,7 @@ namespace musik { namespace box { class OutputWindow : public cursespp::ScrollableWindow -#if ( __clang_major__==7 && __clang_minor__==3 ) +#if (__clang_major__ == 7 && __clang_minor__ == 3) , public std::enable_shared_from_this #endif { diff --git a/src/musikbox/app/window/ResourcesWindow.h b/src/musikbox/app/window/ResourcesWindow.h index 81d79ccc9..75a41b243 100755 --- a/src/musikbox/app/window/ResourcesWindow.h +++ b/src/musikbox/app/window/ResourcesWindow.h @@ -9,7 +9,7 @@ namespace musik { namespace box { class ResourcesWindow : public cursespp::Window -#if true || ( __clang_major__==7 && __clang_minor__==3 ) +#if (__clang_major__ == 7 && __clang_minor__ == 3) , public std::enable_shared_from_this #endif { diff --git a/src/musikbox/app/window/TrackListView.h b/src/musikbox/app/window/TrackListView.h index 3e16c107f..ae6ff97f9 100755 --- a/src/musikbox/app/window/TrackListView.h +++ b/src/musikbox/app/window/TrackListView.h @@ -15,7 +15,7 @@ namespace musik { namespace box { class TrackListView : public cursespp::ListWindow, -#if ( __clang_major__==7 && __clang_minor__==3 ) +#if (__clang_major__ == 7 && __clang_minor__ == 3) public std::enable_shared_from_this, #endif public sigslot::has_slots<> diff --git a/src/musikbox/app/window/TransportWindow.h b/src/musikbox/app/window/TransportWindow.h index 7f86f9cc8..8608450a4 100755 --- a/src/musikbox/app/window/TransportWindow.h +++ b/src/musikbox/app/window/TransportWindow.h @@ -12,7 +12,7 @@ namespace musik { namespace box { class TransportWindow : public cursespp::Window, -#if ( __clang_major__==7 && __clang_minor__==3 ) +#if (__clang_major__ == 7 && __clang_minor__ == 3) public std::enable_shared_from_this, #endif public sigslot::has_slots<>