From 6d8146f6f0fcdaf96c52a0edf0fa512695599e3a Mon Sep 17 00:00:00 2001 From: BtbN Date: Wed, 18 Jun 2014 06:23:37 +0200 Subject: [PATCH] Honor QUIET argument in FindJansson --- cmake/Modules/FindJansson.cmake | 4 +++- deps/glad/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/Modules/FindJansson.cmake b/cmake/Modules/FindJansson.cmake index fc17eeb2c..6518bb2dc 100644 --- a/cmake/Modules/FindJansson.cmake +++ b/cmake/Modules/FindJansson.cmake @@ -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() diff --git a/deps/glad/CMakeLists.txt b/deps/glad/CMakeLists.txt index 5a3bb126c..9e184d85a 100644 --- a/deps/glad/CMakeLists.txt +++ b/deps/glad/CMakeLists.txt @@ -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()