Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor CMakeLists.txt cleanup

Browse Source
This commit is contained in:
Jonas Kvinge 2021-07-21 17:45:22 +02:00
parent 16625b1dc7
commit f144c982e3
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CMakeLists.txt
View File

@ -396,13 +396,13 @@ else()
option(USE_BUNDLE "Bundle dependencies" OFF) option(USE_BUNDLE "Bundle dependencies" OFF)
endif() endif()
if (USE_BUNDLE AND NOT USE_BUNDLE_DIR) if(USE_BUNDLE AND NOT USE_BUNDLE_DIR)
if(LINUX) if(LINUX)
set(USE_BUNDLE_DIR "../plugins") set(USE_BUNDLE_DIR "../plugins")
endif(LINUX) endif(LINUX)
if(APPLE) if(APPLE)
set(USE_BUNDLE_DIR "../PlugIns") set(USE_BUNDLE_DIR "../PlugIns")
endif(APPLE) endif(APPLE)
endif(USE_BUNDLE AND NOT USE_BUNDLE_DIR) endif(USE_BUNDLE AND NOT USE_BUNDLE_DIR)
if(NOT CMAKE_CROSSCOMPILING) if(NOT CMAKE_CROSSCOMPILING)
@ -470,13 +470,9 @@ if(GTest_FOUND AND GMOCK_LIBRARY AND QtTest_LIBRARIES)
endif() endif()
# Uninstall support # Uninstall support
configure_file( configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY)
add_custom_target(uninstall add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
# Show a summary of what we have enabled # Show a summary of what we have enabled
summary_show() summary_show()

15
ext/libstrawberry-common/CMakeLists.txt
View File

@ -20,23 +20,21 @@ else()
qt5_wrap_cpp(MOC ${HEADERS}) qt5_wrap_cpp(MOC ${HEADERS})
endif() endif()
link_directories( link_directories(${GLIB_LIBRARY_DIRS})
${GLIB_LIBRARY_DIRS}
)
add_library(libstrawberry-common STATIC ${SOURCES} ${MOC}) add_library(libstrawberry-common STATIC ${SOURCES} ${MOC})
target_include_directories(libstrawberry-common SYSTEM PRIVATE target_include_directories(libstrawberry-common SYSTEM PRIVATE ${GLIB_INCLUDE_DIRS})
${GLIB_INCLUDE_DIRS}
)
target_include_directories(libstrawberry-common PRIVATE target_include_directories(libstrawberry-common PRIVATE
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src
${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src
) )
if(Backtrace_FOUND)
target_include_directories(libstrawberry-common SYSTEM PRIVATE ${Backtrace_INCLUDE_DIRS})
endif(Backtrace_FOUND)
target_link_libraries(libstrawberry-common PRIVATE target_link_libraries(libstrawberry-common PRIVATE
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${GLIB_LIBRARIES} ${GLIB_LIBRARIES}
@ -45,6 +43,5 @@ target_link_libraries(libstrawberry-common PRIVATE
) )
if(Backtrace_FOUND) if(Backtrace_FOUND)
target_include_directories(libstrawberry-common PRIVATE ${Backtrace_INCLUDE_DIRS})
target_link_libraries(libstrawberry-common PRIVATE ${Backtrace_LIBRARIES}) target_link_libraries(libstrawberry-common PRIVATE ${Backtrace_LIBRARIES})
endif(Backtrace_FOUND) endif(Backtrace_FOUND)