Finish moving zmap to CMake

- Generalize libjson support in CMakeLists - Remove zopt.h, zopt.c from the repository
2013-10-03 12:14:36 -04:00
parent 154fb01525
commit 21fa755c13
4 changed files with 7 additions and 1710 deletions
@@ -42,11 +42,11 @@ endif()

 if(WITH_JSON)
 	include(FindPkgConfig)
-	pkg_check_modules(JSON json-c)
-	if(NOT JSON_FOUND)
-		set(JSON_CFLAGS "")
-		set(JSON_LIBS "-ljson-c")
-		include_directories("/usr/local/include/json-c/")
+	pkg_check_modules(JSON json)
+	if(JSON_FOUND)
+		include_directories(JSON_INCLUDE_DIRS)
+	else()
+		message(FATAL_ERROR "Did not find libjson")
 	endif()

 	add_definitions("-DJSON")