mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 21:37:15 +02:00
55 lines
2.3 KiB
Diff
55 lines
2.3 KiB
Diff
diff --git a/cmake/Modules/CompilerConfig.cmake b/cmake/Modules/CompilerConfig.cmake
|
|
index 849d19d..faa4065 100644
|
|
--- a/cmake/Modules/CompilerConfig.cmake
|
|
+++ b/cmake/Modules/CompilerConfig.cmake
|
|
@@ -108,7 +108,6 @@ else()
|
|
- https://github.com/obsproject/obs-studio/issues/8850 for 13.1.1
|
|
]]
|
|
add_compile_options(
|
|
- -Werror
|
|
-Wextra
|
|
-Wvla
|
|
-Wswitch
|
|
@@ -119,7 +118,7 @@ else()
|
|
-Wno-unused-function
|
|
-Wno-missing-field-initializers
|
|
-fno-strict-aliasing
|
|
- "$<$<COMPILE_LANGUAGE:C>:-Werror-implicit-function-declaration;-Wno-missing-braces>"
|
|
+ "$<$<COMPILE_LANGUAGE:C>:;-Wno-missing-braces>"
|
|
"$<$<BOOL:${USE_LIBCXX}>:-stdlib=libc++>"
|
|
"$<$<CONFIG:DEBUG>:-DDEBUG=1;-D_DEBUG=1>"
|
|
"$<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wnull-conversion;-fcolor-diagnostics;-Wno-error=shorten-64-to-32>"
|
|
diff --git a/cmake/Modules/ObsDefaults_Linux.cmake b/cmake/Modules/ObsDefaults_Linux.cmake
|
|
index d1e58a0..593450f 100644
|
|
--- a/cmake/Modules/ObsDefaults_Linux.cmake
|
|
+++ b/cmake/Modules/ObsDefaults_Linux.cmake
|
|
@@ -77,7 +77,6 @@ macro(setup_obs_project)
|
|
set(OBS_DATA_PATH "${OBS_DATA_DESTINATION}")
|
|
|
|
set(OBS_SCRIPT_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${OBS_SCRIPT_PLUGIN_DESTINATION}")
|
|
- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OBS_LIBRARY_DESTINATION}")
|
|
else()
|
|
set(OBS_EXECUTABLE_DESTINATION "bin/${_ARCH_SUFFIX}bit")
|
|
set(OBS_INCLUDE_DESTINATION "include")
|
|
@@ -92,7 +91,6 @@ macro(setup_obs_project)
|
|
set(OBS_DATA_PATH "../../${OBS_DATA_DESTINATION}")
|
|
|
|
set(OBS_SCRIPT_PLUGIN_PATH "../../${OBS_SCRIPT_PLUGIN_DESTINATION}")
|
|
- set(CMAKE_INSTALL_RPATH "$ORIGIN/" "$ORIGIN/../../${OBS_LIBRARY_DESTINATION}")
|
|
endif()
|
|
|
|
if(BUILD_FOR_PPA)
|
|
diff --git a/deps/glad/CMakeLists.txt b/deps/glad/CMakeLists.txt
|
|
index fba3f3f..0fe32a7 100644
|
|
--- a/deps/glad/CMakeLists.txt
|
|
+++ b/deps/glad/CMakeLists.txt
|
|
@@ -15,7 +15,7 @@ target_sources(
|
|
PRIVATE src/glad.c
|
|
$<$<PLATFORM_ID:Windows>:src/glad_wgl.c>
|
|
$<$<TARGET_EXISTS:OpenGL::EGL>:src/glad_egl.c>
|
|
- $<$<TARGET_EXISTS:OpenGL::EGL>:include/EGL/eglplatform.h>
|
|
+ $<$<TARGET_EXISTS:OpenGL::EGL>:>
|
|
PUBLIC include/glad/glad.h
|
|
"$<$<PLATFORM_ID:Windows>:${CMAKE_CURRENT_SOURCE_DIR}/include/glad/glad_wgl.h>"
|
|
"$<$<TARGET_EXISTS:OpenGL::EGL>:${CMAKE_CURRENT_SOURCE_DIR}/include/glad/glad_egl.h>")
|