Merge pull request #121 from BtbN/fixes

Honor QUIET argument in FindJansson

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()
 

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()