mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-03-16 13:37:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #121 from BtbN/fixes

Browse Source 
Honor QUIET argument in FindJansson
This commit is contained in:
Jim
2014-06-22 14:01:08 -07:00
parent e430ff3a52 6d8146f6f0
commit 79619d0691
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/Modules/FindJansson.cmake
View File

@@ -46,7 +46,9 @@ else()
".*#define[ \t]+JANSSON_VERSION[ \t]+\"(.+)\".*" "\\1"
_JANSSON_VERSION_STRING "${_jansson_version_parse}")
else()
message(WARNING "Failed to find Jansson version")
if(NOT Jansson_FIND_QUIETLY)
message(WARNING "Failed to find Jansson version")
endif()
set(_JANSSON_VERSION_STRING "unknown")
endif()

2
deps/glad/CMakeLists.txt vendored
View File

@@ -30,7 +30,7 @@ target_include_directories(glad
target_compile_definitions(glad
PRIVATE GLAD_GLAPI_EXPORT_BUILD)
if(NOT WIN32)
if(NOT MSVC)
target_compile_options(glad
PRIVATE -DPIC -fPIC -fvisibility=hidden)
endif()