diff --git a/3rdparty/singleapplication/CMakeLists.txt b/3rdparty/singleapplication/CMakeLists.txt index 8519ac9c..2a95bbc2 100644 --- a/3rdparty/singleapplication/CMakeLists.txt +++ b/3rdparty/singleapplication/CMakeLists.txt @@ -5,10 +5,10 @@ include(CheckFunctionExists) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -U__STRICT_ANSI__ -Wall -Woverloaded-virtual -Wno-sign-compare -fpermissive") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -U__STRICT_ANSI__ -Wall -Wextra -Wpedantic -Woverloaded-virtual -fpermissive") -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -Wpedantic") +if(APPLE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter") endif() if(CMAKE_VERSION VERSION_GREATER 3.0) diff --git a/CMakeLists.txt b/CMakeLists.txt index ebde0da9..0d4d5250 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,27 +61,17 @@ if (CMAKE_CXX_COMPILER MATCHES ".*clang") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-uninitialized") endif() -if (APPLE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --stdlib=libc++") -endif(APPLE) - find_program(CCACHE_EXECUTABLE NAMES ccache) if (CCACHE_EXECUTABLE) message(STATUS "ccache found: will be used for compilation and linkage") SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_EXECUTABLE}) SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_EXECUTABLE}) endif () -find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert lconvert-qt5 PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) -find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert lconvert-qt5) find_package(PkgConfig REQUIRED) -pkg_check_modules(GLIB REQUIRED glib-2.0) -pkg_check_modules(GIO REQUIRED gio-2.0) -pkg_check_modules(GOBJECT REQUIRED gobject-2.0) -pkg_check_modules(CDIO libcdio) +find_package(Boost REQUIRED) find_package(Threads) find_package(GnuTLS) -find_package(Boost REQUIRED) find_package(Protobuf REQUIRED) find_library(PROTOBUF_STATIC_LIBRARY libprotobuf.a libprotobuf) if(LINUX) @@ -98,6 +88,10 @@ endif() if(X11_FOUND) set(HAVE_X11 ON) endif() +pkg_check_modules(GLIB REQUIRED glib-2.0) +pkg_check_modules(GIO REQUIRED gio-2.0) +pkg_check_modules(GOBJECT REQUIRED gobject-2.0) +pkg_check_modules(LIBCDIO libcdio) pkg_check_modules(GSTREAMER gstreamer-1.0) pkg_check_modules(GSTREAMER_BASE gstreamer-base-1.0) pkg_check_modules(GSTREAMER_AUDIO gstreamer-audio-1.0) @@ -303,7 +297,7 @@ optional_component(GLOBALSHORTCUTS ON "Global shortcuts" ) optional_component(AUDIOCD ON "Devices: Audio CD support" - DEPENDS "libcdio" CDIO_FOUND + DEPENDS "libcdio" LIBCDIO_FOUND ) optional_component(UDISKS2 ON "Devices: UDisks2 backend" diff --git a/ext/gstmoodbar/CMakeLists.txt b/ext/gstmoodbar/CMakeLists.txt index 8e20aeea..8e90e0bd 100644 --- a/ext/gstmoodbar/CMakeLists.txt +++ b/ext/gstmoodbar/CMakeLists.txt @@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 2.8.11) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -U__STRICT_ANSI__ -Wall -Woverloaded-virtual -Wno-sign-compare -fpermissive") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -U__STRICT_ANSI__ -Wall -Wextra -Wpedantic -Woverloaded-virtual -fpermissive") -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -Wpedantic") +if(APPLE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter") endif() include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/ext/libstrawberry-common/CMakeLists.txt b/ext/libstrawberry-common/CMakeLists.txt index e684348a..93ce3fb3 100644 --- a/ext/libstrawberry-common/CMakeLists.txt +++ b/ext/libstrawberry-common/CMakeLists.txt @@ -5,10 +5,10 @@ include_directories(${CMAKE_SOURCE_DIR}/src) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -U__STRICT_ANSI__ -Wall -Woverloaded-virtual -Wno-sign-compare -fpermissive") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -U__STRICT_ANSI__ -Wall -Wextra -Wpedantic -Woverloaded-virtual -fpermissive") -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -Wpedantic") +if(APPLE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter") endif() set(SOURCES diff --git a/ext/libstrawberry-tagreader/CMakeLists.txt b/ext/libstrawberry-tagreader/CMakeLists.txt index de86a7c4..d55497a6 100644 --- a/ext/libstrawberry-tagreader/CMakeLists.txt +++ b/ext/libstrawberry-tagreader/CMakeLists.txt @@ -7,10 +7,10 @@ include_directories(${CMAKE_BINARY_DIR}/src) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -U__STRICT_ANSI__ -Wall -Woverloaded-virtual -Wno-sign-compare -fpermissive") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -U__STRICT_ANSI__ -Wall -Wextra -Wpedantic -Woverloaded-virtual -fpermissive") -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -Wpedantic") +if(APPLE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter") endif() set(MESSAGES diff --git a/ext/strawberry-tagreader/CMakeLists.txt b/ext/strawberry-tagreader/CMakeLists.txt index 274706bc..65a43a3e 100644 --- a/ext/strawberry-tagreader/CMakeLists.txt +++ b/ext/strawberry-tagreader/CMakeLists.txt @@ -9,10 +9,10 @@ include_directories(${CMAKE_BINARY_DIR}/src) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -U__STRICT_ANSI__ -Wall -Woverloaded-virtual -Wno-sign-compare -fpermissive") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -U__STRICT_ANSI__ -Wall -Wextra -Wpedantic -Woverloaded-virtual -fpermissive") -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -Wpedantic") +if(APPLE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter") endif() set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 12d713ef..00ced7ef 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,10 +16,10 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -U__STRICT_ANSI__ -Wall -Woverloaded-virtual -Wno-sign-compare -fpermissive") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -U__STRICT_ANSI__ -Wall -Wextra -Wpedantic -Woverloaded-virtual -fpermissive") -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -Wpedantic") +if(APPLE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter") endif() option(BUILD_WERROR "Build with -Werror" OFF) @@ -44,12 +44,11 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_definitions(-DBOOST_BIND_NO_PLACEHOLDERS) include_directories(${CMAKE_BINARY_DIR}) -include_directories(${GLIB_INCLUDE_DIRS}) +include_directories(${Boost_INCLUDE_DIRS}) include_directories(${GLIBCONFIG_INCLUDE_DIRS}) +include_directories(${GLIB_INCLUDE_DIRS}) include_directories(${GOBJECT_INCLUDE_DIRS}) include_directories(${GNUTLS_INCLUDE_DIR}) -include_directories(${Boost_INCLUDE_DIRS}) -include_directories(${CHROMAPRINT_INCLUDE_DIRS}) if (X11_FOUND) include_directories(${X11_INCLUDE_DIR}) @@ -58,16 +57,31 @@ endif(X11_FOUND) if(HAVE_GSTREAMER) link_directories(${GSTREAMER_LIBRARY_DIRS}) include_directories(${GSTREAMER_INCLUDE_DIRS}) - include_directories(${GSTREAMER_APP_INCLUDE_DIRS}) - include_directories(${GSTREAMER_AUDIO_INCLUDE_DIRS}) + link_directories(${GSTREAMER_BASE_LIBRARY_DIRS}) include_directories(${GSTREAMER_BASE_INCLUDE_DIRS}) + link_directories(${GSTREAMER_APP_LIBRARY_DIRS}) + include_directories(${GSTREAMER_APP_INCLUDE_DIRS}) + link_directories(${GSTREAMER_AUDIO_LIBRARY_DIRS}) + include_directories(${GSTREAMER_AUDIO_INCLUDE_DIRS}) + link_directories(${GSTREAMER_TAG_LIBRARY_DIRS}) include_directories(${GSTREAMER_TAG_INCLUDE_DIRS}) + link_directories(${GSTREAMER_PBUTILS_LIBRARY_DIRS}) include_directories(${GSTREAMER_PBUTILS_INCLUDE_DIRS}) -endif() +endif(HAVE_GSTREAMER) if(HAVE_PHONON) include_directories(${PHONON_INCLUDE_DIRS}) -endif() +endif(HAVE_PHONON) + +if(HAVE_CHROMAPRINT) + link_directories(${CHROMAPRINT_LIBRARY_DIRS}) + include_directories(${CHROMAPRINT_INCLUDE_DIRS}) +endif(HAVE_CHROMAPRINT) + +if(HAVE_AUDIOCD) + link_directories(${LIBCDIO_LIBRARY_DIRS}) + include_directories(${LIBCDIO_INCLUDE_DIRS}) +endif(HAVE_AUDIOCD) link_directories(${TAGLIB_LIBRARY_DIRS}) include_directories(${TAGLIB_INCLUDE_DIRS}) @@ -77,6 +91,11 @@ link_directories(${SINGLECOREAPPLICATION_LIBRARY_DIRS}) include_directories(${SINGLEAPPLICATION_INCLUDE_DIRS}) include_directories(${SINGLECOREAPPLICATION_INCLUDE_DIRS}) +if(HAVE_LIBMTP) + link_directories(${LIBMTP_LIBRARY_DIRS}) + include_directories(${LIBMTP_INCLUDE_DIRS}) +endif(HAVE_LIBMTP) + include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-common) include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-tagreader) include_directories(${CMAKE_BINARY_DIR}/ext/libstrawberry-tagreader) @@ -1069,7 +1088,7 @@ if(HAVE_GIO) endif(HAVE_GIO) if(HAVE_AUDIOCD) - target_link_libraries(strawberry_lib ${CDIO_LIBRARIES}) + target_link_libraries(strawberry_lib ${LIBCDIO_LIBRARIES}) endif(HAVE_AUDIOCD) if(HAVE_IMOBILEDEVICE)