mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code

Merge pull request #2972 from kkartaltepe/cmake-variety-fixes

Browse Source 
cmake: Fix warnings and normalize variables/errors
This commit is contained in:
Jim 2020-05-21 19:40:57 -07:00 committed by GitHub
commit b0e8ba6db8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 63 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/win-update/updater/CMakeLists.txt
View File

@ -14,8 +14,6 @@ include_directories(${LIBLZMA_INCLUDE_DIRS})
include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/libobs") include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/libobs")
include_directories(${BLAKE2_INCLUDE_DIR}) include_directories(${BLAKE2_INCLUDE_DIR})
find_package(ZLIB REQUIRED)
set(updater_HEADERS set(updater_HEADERS
../win-update-helpers.hpp ../win-update-helpers.hpp
resource.h resource.h

12
cmake/Modules/FindLibVLC.cmake
View File

@ -4,9 +4,6 @@
# LIBVLC_INCLUDE_DIRS # LIBVLC_INCLUDE_DIRS
# LIBVLC_LIBRARIES # LIBVLC_LIBRARIES
# #
# For use in OBS:
#
# VLC_INCLUDE_DIR
find_package(PkgConfig QUIET) find_package(PkgConfig QUIET)
if (PKG_CONFIG_FOUND) if (PKG_CONFIG_FOUND)
@ -59,14 +56,11 @@ find_library(VLC_LIB
../bin${_lib_suffix} ../bin) ../bin${_lib_suffix} ../bin)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(LibVLC_INCLUDES DEFAULT_MSG VLC_INCLUDE_DIR) # OBS doesnt depend on linking, so we dont include VLC_LIB here as required.
find_package_handle_standard_args(LibVLC DEFAULT_MSG VLC_LIB VLC_INCLUDE_DIR) find_package_handle_standard_args(LibVLC DEFAULT_MSG VLC_INCLUDE_DIR)
mark_as_advanced(VLC_INCLUDE_DIR VLC_LIB) mark_as_advanced(VLC_INCLUDE_DIR VLC_LIB)
if(LIBVLC_INCLUDES_FOUND)
set(LIBVLC_INCLUDE_DIRS ${VLC_INCLUDE_DIR})
endif()
if(LIBVLC_FOUND) if(LIBVLC_FOUND)
set(LIBVLC_LIBRARIES ${VLC_LIB}) set(LIBVLC_LIBRARIES ${VLC_LIB})
set(LIBVLC_INCLUDE_DIRS ${VLC_INCLUDE_DIR})
endif() endif()

2
cmake/Modules/FindLibv4l2.cmake
View File

@ -24,7 +24,7 @@ find_library(V4L2_LIB
/usr/lib /usr/local/lib /opt/local/lib) /usr/lib /usr/local/lib /opt/local/lib)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(LibV4L2 DEFAULT_MSG V4L2_LIB V4L2_INCLUDE_DIR) find_package_handle_standard_args(Libv4l2 DEFAULT_MSG V4L2_LIB V4L2_INCLUDE_DIR)
mark_as_advanced(V4L2_INCLUDE_DIR V4L2_LIB) mark_as_advanced(V4L2_INCLUDE_DIR V4L2_LIB)
if(LIBV4L2_FOUND) if(LIBV4L2_FOUND)

26
cmake/Modules/FindMbedTLS.cmake
View File

@ -1,12 +1,9 @@
# Once done these will be defined: # Once done these will be defined:
# #
# LIBMBEDTLS_FOUND # MBEDTLS_FOUND
# LIBMBEDTLS_INCLUDE_DIRS # MBEDTLS_INCLUDE_DIRS
# LIBMBEDTLS_LIBRARIES # MBEDTLS_LIBRARIES
# #
# For use in OBS:
#
# MBEDTLS_INCLUDE_DIR
find_package(PkgConfig QUIET) find_package(PkgConfig QUIET)
if (PKG_CONFIG_FOUND) if (PKG_CONFIG_FOUND)
@ -122,22 +119,19 @@ endif()
# If we find all three libraries, then go ahead. # If we find all three libraries, then go ahead.
if(MBEDTLS_LIB AND MBEDCRYPTO_LIB AND MBEDX509_LIB) if(MBEDTLS_LIB AND MBEDCRYPTO_LIB AND MBEDX509_LIB)
set(LIBMBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR}) set(MBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR})
set(LIBMBEDTLS_LIBRARIES ${MBEDTLS_LIB} ${MBEDCRYPTO_LIB} ${MBEDX509_LIB}) set(MBEDTLS_LIBRARIES ${MBEDTLS_LIB} ${MBEDCRYPTO_LIB} ${MBEDX509_LIB})
set(MBEDTLS_INCLUDE_DIRS ${LIBMBEDTLS_INCLUDE_DIRS})
set(MBEDTLS_LIBRARIES ${LIBMBEDTLS_LIBRARIES})
# Otherwise, if we find MBEDTLS_LIB, and it has both CRYPTO and x509 # Otherwise, if we find MBEDTLS_LIB, and it has both CRYPTO and x509
# within the single lib (i.e. a windows build environment), then also # within the single lib (i.e. a windows build environment), then also
# feel free to go ahead. # feel free to go ahead.
elseif(MBEDTLS_LIB AND MBEDTLS_INCLUDES_CRYPTO AND MBEDTLS_INCLUDES_X509) elseif(MBEDTLS_LIB AND MBEDTLS_INCLUDES_CRYPTO AND MBEDTLS_INCLUDES_X509)
set(LIBMBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR}) set(MBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR})
set(LIBMBEDTLS_LIBRARIES ${MBEDTLS_LIB}) set(MBEDTLS_LIBRARIES ${MBEDTLS_LIB})
set(MBEDTLS_INCLUDE_DIRS ${LIBMBEDTLS_INCLUDE_DIRS})
set(MBEDTLS_LIBRARIES ${LIBMBEDTLS_LIBRARIES})
endif() endif()
# Now we've accounted for the 3-vs-1 library case: # Now we've accounted for the 3-vs-1 library case:
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Libmbedtls DEFAULT_MSG MBEDTLS_LIBRARIES MBEDTLS_INCLUDE_DIRS) find_package_handle_standard_args(MbedTLS DEFAULT_MSG MBEDTLS_LIBRARIES MBEDTLS_INCLUDE_DIRS)
mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARIES MBEDTLS_INCLUDE_DIRS) mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDTLS_LIB MBEDCRYPTO_LIB MBEDX509_LIB)

2
cmake/Modules/FindLibUDev.cmake → cmake/Modules/FindUDev.cmake
View File

@ -6,7 +6,7 @@
find_package(PkgConfig QUIET) find_package(PkgConfig QUIET)
if (PKG_CONFIG_FOUND) if (PKG_CONFIG_FOUND)
pkg_check_modules(_UDEV QUIET udev) pkg_check_modules(_UDEV QUIET libudev)
endif() endif()
find_path(UDEV_INCLUDE_DIR find_path(UDEV_INCLUDE_DIR

2
cmake/Modules/FindVulkan.cmake
View File

@ -61,7 +61,7 @@ find_library(VULKAN_LIB
../bin${_lib_suffix} ../bin) ../bin${_lib_suffix} ../bin)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(vulkan DEFAULT_MSG VULKAN_LIB VULKAN_INCLUDE_DIR) find_package_handle_standard_args(Vulkan DEFAULT_MSG VULKAN_LIB VULKAN_INCLUDE_DIR)
mark_as_advanced(VULKAN_INCLUDE_DIR VULKAN_LIB) mark_as_advanced(VULKAN_INCLUDE_DIR VULKAN_LIB)
if(VULKAN_FOUND) if(VULKAN_FOUND)

21
cmake/Modules/FindXCB.cmake
View File

@ -204,30 +204,19 @@ macro(_XCB_HANDLE_COMPONENT _comp)
find_path(XCB_${_comp}_INCLUDE_DIR NAMES ${_header} HINTS ${PKG_XCB_INCLUDE_DIRS}) find_path(XCB_${_comp}_INCLUDE_DIR NAMES ${_header} HINTS ${PKG_XCB_INCLUDE_DIRS})
find_library(XCB_${_comp}_LIBRARY NAMES ${_lib} HINTS ${PKG_XCB_LIBRARY_DIRS}) find_library(XCB_${_comp}_LIBRARY NAMES ${_lib} HINTS ${PKG_XCB_LIBRARY_DIRS})
mark_as_advanced(XCB_${_comp}_LIBRARY XCB_${_comp}_INCLUDE_DIR)
if(XCB_${_comp}_INCLUDE_DIR AND XCB_${_comp}_LIBRARY) if(XCB_${_comp}_INCLUDE_DIR AND XCB_${_comp}_LIBRARY)
set(XCB_${_comp}_FOUND TRUE)
list(APPEND XCB_INCLUDE_DIRS ${XCB_${_comp}_INCLUDE_DIR}) list(APPEND XCB_INCLUDE_DIRS ${XCB_${_comp}_INCLUDE_DIR})
list(APPEND XCB_LIBRARIES ${XCB_${_comp}_LIBRARY}) list(APPEND XCB_LIBRARIES ${XCB_${_comp}_LIBRARY})
if (NOT XCB_FIND_QUIETLY) if (NOT XCB_FIND_QUIETLY)
message(STATUS "XCB[${_comp}]: Found component ${_comp}") message(STATUS "XCB[${_comp}]: Found component ${_comp}")
endif() endif()
endif() endif()
if(XCB_FIND_REQUIRED_${_comp})
list(APPEND requiredComponents XCB_${_comp}_FOUND)
endif()
find_package_handle_standard_args(XCB_${_comp} DEFAULT_MSG XCB_${_comp}_LIBRARY XCB_${_comp}_INCLUDE_DIR)
mark_as_advanced(XCB_${_comp}_LIBRARY XCB_${_comp}_INCLUDE_DIR)
# compatibility for old variable naming
set(XCB_${_comp}_INCLUDE_DIRS ${XCB_${_comp}_INCLUDE_DIR})
set(XCB_${_comp}_LIBRARIES ${XCB_${_comp}_LIBRARY})
endmacro() endmacro()
IF (NOT WIN32) IF (NOT WIN32)
include(FindPackageHandleStandardArgs)
# Use pkg-config to get the directories and then use these values # Use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls # in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig) find_package(PkgConfig)
@ -243,9 +232,11 @@ IF (NOT WIN32)
list(REMOVE_DUPLICATES XCB_INCLUDE_DIRS) list(REMOVE_DUPLICATES XCB_INCLUDE_DIRS)
endif() endif()
find_package_handle_standard_args(XCB DEFAULT_MSG XCB_LIBRARIES XCB_INCLUDE_DIRS ${requiredComponents}) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(XCB
REQUIRED_VARS XCB_LIBRARIES XCB_INCLUDE_DIRS
HANDLE_COMPONENTS)
# compatibility for old variable naming # compatibility for old variable naming
set(XCB_INCLUDE_DIR ${XCB_INCLUDE_DIRS}) set(XCB_INCLUDE_DIR ${XCB_INCLUDE_DIRS})
ENDIF (NOT WIN32) ENDIF (NOT WIN32)

5
cmake/Modules/FindZLIB.cmake
View File

@ -4,9 +4,6 @@
# ZLIB_INCLUDE_DIRS # ZLIB_INCLUDE_DIRS
# ZLIB_LIBRARIES # ZLIB_LIBRARIES
# #
# For use in OBS:
#
# ZLIB_INCLUDE_DIR
find_package(PkgConfig QUIET) find_package(PkgConfig QUIET)
if (PKG_CONFIG_FOUND) if (PKG_CONFIG_FOUND)
@ -59,7 +56,7 @@ find_library(ZLIB_LIB
../bin${_lib_suffix} ../bin) ../bin${_lib_suffix} ../bin)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(zlib DEFAULT_MSG ZLIB_LIB ZLIB_INCLUDE_DIR) find_package_handle_standard_args(ZLIB DEFAULT_MSG ZLIB_LIB ZLIB_INCLUDE_DIR)
mark_as_advanced(ZLIB_INCLUDE_DIR ZLIB_LIB) mark_as_advanced(ZLIB_INCLUDE_DIR ZLIB_LIB)
if(ZLIB_FOUND) if(ZLIB_FOUND)

2
libobs/CMakeLists.txt
View File

@ -74,7 +74,7 @@ endif()
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
include_directories(SYSTEM ${ZLIB_INCLUDE_DIR}) include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS})
add_definitions(-DLIBOBS_EXPORTS) add_definitions(-DLIBOBS_EXPORTS)

31
plugins/linux-v4l2/CMakeLists.txt
View File

@ -5,23 +5,28 @@ if(DISABLE_V4L2)
return() return()
endif() endif()
find_package(Libv4l2)
find_package(LibUDev QUIET)
if(NOT LIBV4L2_FOUND AND ENABLE_V4L2) if(ENABLE_V4L2)
message(FATAL_ERROR "libv4l2 not found bit plugin set as enabled") find_package(Libv4l2 REQUIRED)
elseif(NOT LIBV4L2_FOUND) else()
message(STATUS "libv4l2 not found, disabling v4l2 plugin") find_package(Libv4l2)
return() if(NOT LIBV4L2_FOUND)
message(STATUS "libv4l2 not found, disabling v4l2 plugin")
return()
endif()
endif() endif()
if(NOT UDEV_FOUND OR DISABLE_UDEV) if(DISABLE_UDEV)
message(STATUS "udev disabled for v4l2 plugin")
else()
set(linux-v4l2-udev_SOURCES
v4l2-udev.c
)
add_definitions(-DHAVE_UDEV) add_definitions(-DHAVE_UDEV)
else()
find_package(UDev)
if(NOT UDEV_FOUND)
message(STATUS "udev disabled for v4l2 plugin")
else()
set(linux-v4l2-udev_SOURCES
v4l2-udev.c
)
endif()
endif() endif()
include_directories( include_directories(

25
plugins/obs-outputs/CMakeLists.txt
View File

@ -5,22 +5,21 @@ set_property(CACHE WITH_RTMPS PROPERTY STRINGS AUTO ON OFF)
option(STATIC_MBEDTLS "Statically link mbedTLS into binary" OFF) option(STATIC_MBEDTLS "Statically link mbedTLS into binary" OFF)
if (WITH_RTMPS OR (WITH_RTMPS STREQUAL "AUTO")) if (WITH_RTMPS STREQUAL "AUTO")
find_package(MbedTLS QUIET) find_package(MbedTLS)
find_package(ZLIB QUIET) find_package(ZLIB)
if (NOT MBEDTLS_FOUND OR NOT ZLIB_FOUND)
set(WITH_RTMPS "OFF")
message(WARNING "mbedTLS or zlib was not found, RTMPS will be auto-disabled")
endif()
endif() endif()
if (LIBMBEDTLS_FOUND AND ZLIB_FOUND) if (WITH_RTMPS)
find_package(MbedTLS REQUIRED)
find_package(ZLIB REQUIRED)
add_definitions(-DCRYPTO -DUSE_MBEDTLS) add_definitions(-DCRYPTO -DUSE_MBEDTLS)
include_directories(${LIBMBEDTLS_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) include_directories(${MBEDTLS_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
else() else()
if(WITH_RTMPS STREQUAL "AUTO")
message(WARNING "mbedTLS was not found, RTMPS will be auto-disabled")
elseif (WITH_RTMPS)
message(FATAL_ERROR "RTMPS enabled by user, but mbedTLS was not found")
endif()
unset(LIBMBEDTLS_LIBRARIES)
unset(ZLIB_LIBRARIES)
add_definitions(-DNO_CRYPTO) add_definitions(-DNO_CRYPTO)
endif() endif()
@ -172,7 +171,7 @@ add_library(obs-outputs MODULE
${obs-outputs_librtmp_HEADERS}) ${obs-outputs_librtmp_HEADERS})
target_link_libraries(obs-outputs target_link_libraries(obs-outputs
libobs libobs
${LIBMBEDTLS_LIBRARIES} ${MBEDTLS_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${ftl_IMPORTS} ${ftl_IMPORTS}
${obs-outputs_PLATFORM_DEPS}) ${obs-outputs_PLATFORM_DEPS})

16
plugins/vlc-video/CMakeLists.txt
View File

@ -5,13 +5,14 @@ if(DISABLE_VLC)
return() return()
endif() endif()
find_package(LibVLC QUIET) if(ENABLE_VLC)
find_package(LibVLC REQUIRED)
if(NOT LIBVLC_INCLUDES_FOUND AND ENABLE_VLC) else()
message(FATAL_ERROR "LibVLC includes not found but set as enabled") find_package(LibVLC)
elseif(NOT LIBVLC_INCLUDES_FOUND) if(NOT LibVLC_FOUND)
message(STATUS "LibVLC includes not found, VLC video plugin disabled") message(STATUS "VLC video plugin disabled")
return() return()
endif()
endif() endif()
include_directories(${LIBVLC_INCLUDE_DIRS}) include_directories(${LIBVLC_INCLUDE_DIRS})
@ -41,6 +42,7 @@ endif()
add_library(vlc-video MODULE add_library(vlc-video MODULE
${vlc-video_SOURCES} ${vlc-video_SOURCES}
${vlc-video_HEADERS}) ${vlc-video_HEADERS})
# instead of linking vlc we load at runtime.
target_link_libraries(vlc-video target_link_libraries(vlc-video
libobs libobs
${vlc-video_PLATFORM_DEPS}) ${vlc-video_PLATFORM_DEPS})