Merge pull request #2027 from madhat1/bugfix/fix_cjson_cmake

Fix cmake not building correctly when WITH_CJSON=OFF
5 years ago · e6aa1e8151
parent e2ebddfc54 c16514ca23
commit e6aa1e8151
1 changed files with 8 additions and 6 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -99,12 +99,14 @@ if (WITH_DLT)
 	add_definitions("-DWITH_DLT")
 endif (WITH_DLT)

-FIND_PACKAGE(cJSON)
-if (CJSON_FOUND)
-	message(STATUS ${CJSON_FOUND})
-else (CJSON_FOUND)
-	message(STATUS "Optional dependency cJSON not found. Some features will be disabled.")
-endif(CJSON_FOUND)
+if (WITH_CJSON)
+    FIND_PACKAGE(cJSON)
+    if (CJSON_FOUND)
+	    message(STATUS ${CJSON_FOUND})
+    else (CJSON_FOUND)
+	    message(STATUS "Optional dependency cJSON not found. Some features will be disabled.")
+    endif(CJSON_FOUND)
+endif()

 # ========================================
 # Include projects