Don't turn on JSON Schema checking for osX(Apple).

jongough · Aug 3, 2019 · 3fb47cb · 3fb47cb
1 parent a83f607
commit 3fb47cb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,7 +29,7 @@ SET(CPACK_PACKAGE_CONTACT "Jon Gough")
 
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "6")
-SET(VERSION_PATCH "14")
+SET(VERSION_PATCH "15")
 SET(VERSION_DATE "03/08/2019")
 SET(OCPN_MIN_VERSION "ov50")
 SET(OD_COMMENT "  * Initial release for O5 using CI")

diff --git a/cmake/PluginConfigure.cmake b/cmake/PluginConfigure.cmake
@@ -189,7 +189,12 @@ add_subdirectory(ocpnsrc/glu)
 SET( OPENGL_LIBRARIES "GLU_static" ${OPENGL_LIBRARIES})
 MESSAGE (STATUS "    Revised GL Lib (with local): " ${OPENGL_LIBRARIES})
 
-OPTION(OD_JSON_SCHEMA_VALIDATOR "Use JSON Schema validator" ON)
+IF(APPLE)
+    OPTION(OD_JSON_SCHEMA_VALIDATOR "Use JSON Schema validator" OFF)
+ELSE(APPLE)
+    OPTION(OD_JSON_SCHEMA_VALIDATOR "Use JSON Schema validator" ON)
+ENDIF(APPLE)
+
 IF(OD_JSON_SCHEMA_VALIDATOR)
     MESSAGE(STATUS "Using JSON Schema validation - warning this changes the 'flavour' of the executable and it may not be compatible with OpenCPN")
     ADD_DEFINITIONS(-DOD_JSON_SCHEMA_VALIDATOR)