Browse Source

Fix some CMake details, be quiet if pkg-config not found

Signed-off-by: falkTX <falktx@falktx.com>
pull/506/head
falkTX 2 months ago
parent
commit
157692d557
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 19 additions and 13 deletions
  1. +3
    -3
      CMakeLists.txt
  2. +16
    -10
      cmake/DPF-plugin.cmake

+ 3
- 3
CMakeLists.txt View File

@@ -4,7 +4,7 @@
# #
# SPDX-License-Identifier: ISC # SPDX-License-Identifier: ISC


cmake_minimum_required(VERSION 3.8)
cmake_minimum_required(VERSION 3.8...3.31)


project(DPF) project(DPF)


@@ -30,7 +30,7 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
include(DPF-plugin) include(DPF-plugin)


if(DPF_LIBRARIES) if(DPF_LIBRARIES)
find_package(PkgConfig)
find_package(PkgConfig QUIET)
if(PKG_CONFIG_FOUND) if(PKG_CONFIG_FOUND)
pkg_check_modules(CAIRO "cairo") pkg_check_modules(CAIRO "cairo")
if(CAIRO_FOUND AND (NOT HAIKU)) if(CAIRO_FOUND AND (NOT HAIKU))
@@ -42,7 +42,7 @@ if(DPF_LIBRARIES)
endif() endif()


if(DPF_EXAMPLES) if(DPF_EXAMPLES)
find_package(PkgConfig)
find_package(PkgConfig QUIET)
if(PKG_CONFIG_FOUND) if(PKG_CONFIG_FOUND)
pkg_check_modules(CAIRO "cairo") pkg_check_modules(CAIRO "cairo")
if(CAIRO_FOUND AND (NOT HAIKU)) if(CAIRO_FOUND AND (NOT HAIKU))


+ 16
- 10
cmake/DPF-plugin.cmake View File

@@ -401,8 +401,12 @@ function(dpf__build_jack NAME HAS_UI)
target_compile_definitions("${NAME}" PUBLIC "HAVE_JACK") target_compile_definitions("${NAME}" PUBLIC "HAVE_JACK")
target_compile_definitions("${NAME}-jack" PRIVATE "HAVE_GETTIMEOFDAY") target_compile_definitions("${NAME}-jack" PRIVATE "HAVE_GETTIMEOFDAY")


find_package(PkgConfig)
pkg_check_modules(SDL2 "sdl2")
find_package(PkgConfig QUIET)
if(PKG_CONFIG_FOUND)
pkg_check_modules(SDL2 "sdl2")
else()
set(SDL2_FOUND FALSE)
endif()
if(SDL2_FOUND) if(SDL2_FOUND)
target_compile_definitions("${NAME}" PUBLIC "HAVE_SDL2") target_compile_definitions("${NAME}" PUBLIC "HAVE_SDL2")
target_include_directories("${NAME}-jack" PRIVATE ${SDL2_STATIC_INCLUDE_DIRS}) target_include_directories("${NAME}-jack" PRIVATE ${SDL2_STATIC_INCLUDE_DIRS})
@@ -475,8 +479,12 @@ endfunction()
# Add build rules for a DSSI plugin. # Add build rules for a DSSI plugin.
# #
function(dpf__build_dssi NAME HAS_UI) function(dpf__build_dssi NAME HAS_UI)
find_package(PkgConfig)
pkg_check_modules(LIBLO "liblo")
find_package(PkgConfig QUIET)
if(PKG_CONFIG_FOUND)
pkg_check_modules(LIBLO "liblo")
else()
set(LIBLO_FOUND FALSE)
endif()
if(NOT LIBLO_FOUND) if(NOT LIBLO_FOUND)
dpf__warn_once_only(missing_liblo dpf__warn_once_only(missing_liblo
"liblo is not found, skipping the `dssi` plugin targets") "liblo is not found, skipping the `dssi` plugin targets")
@@ -563,8 +571,7 @@ function(dpf__build_lv2 NAME HAS_UI MONOLITHIC EXTRA_UI_LINK_OPTS)
${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_CROSSCOMPILING_EMULATOR}
"$<TARGET_FILE:lv2_ttl_generator>" "$<TARGET_FILE:lv2_ttl_generator>"
"$<TARGET_FILE:${NAME}-lv2>" "$<TARGET_FILE:${NAME}-lv2>"
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/bin/${NAME}.lv2"
DEPENDS lv2_ttl_generator)
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/bin/${NAME}.lv2")
endfunction() endfunction()


# dpf__build_vst2 # dpf__build_vst2
@@ -759,8 +766,7 @@ function(dpf__build_au NAME HAS_UI)


add_custom_command(TARGET "${NAME}-au" POST_BUILD add_custom_command(TARGET "${NAME}-au" POST_BUILD
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} "$<TARGET_FILE:${NAME}-export>" "${NAME}" COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} "$<TARGET_FILE:${NAME}-export>" "${NAME}"
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/bin/${NAME}.component/Contents"
DEPENDS "${NAME}-export")
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/bin/${NAME}.component/Contents")


add_dependencies("${NAME}-au" "${NAME}-export") add_dependencies("${NAME}-au" "${NAME}-export")


@@ -806,7 +812,7 @@ function(dpf__add_dgl_cairo SHARED_RESOURCES USE_FILE_BROWSER USE_WEB_VIEW)
return() return()
endif() endif()


find_package(PkgConfig)
find_package(PkgConfig REQUIRED)
pkg_check_modules(CAIRO "cairo" REQUIRED) pkg_check_modules(CAIRO "cairo" REQUIRED)


link_directories(${CAIRO_LIBRARY_DIRS}) link_directories(${CAIRO_LIBRARY_DIRS})
@@ -1453,7 +1459,7 @@ function(dpf__add_dgl_system_libs)
elseif(WIN32) elseif(WIN32)
target_link_libraries(dgl-system-libs INTERFACE "comdlg32" "dwmapi" "gdi32") target_link_libraries(dgl-system-libs INTERFACE "comdlg32" "dwmapi" "gdi32")
else() else()
find_package(PkgConfig)
find_package(PkgConfig REQUIRED)
pkg_check_modules(DBUS "dbus-1") pkg_check_modules(DBUS "dbus-1")
if(DBUS_FOUND) if(DBUS_FOUND)
target_compile_definitions(dgl-system-libs-definitions INTERFACE "HAVE_DBUS") target_compile_definitions(dgl-system-libs-definitions INTERFACE "HAVE_DBUS")


Loading…
Cancel
Save