improved cmake

CMakeLists.txt

@@ -1,7 +1,10 @@
 cmake_minimum_required(VERSION 2.8)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/")
 project(pdns-slave)
-find_package(GTest REQUIRED)
-enable_testing()
+find_package(JsonCpp REQUIRED)
+find_package(GTest)
 add_subdirectory(src)
-add_subdirectory(tests)
+if (GTEST_FOUND)
+    enable_testing()
+    add_subdirectory(tests)
+endif (GTEST_FOUND)

CMakeModules/FindJsonCpp.cmake

@@ -0,0 +1,46 @@
+# -*- cmake -*-
+# - Find JSONCpp
+# Find the JSONCpp includes and library
+# This module defines
+#  JSONCPP_INCLUDE_DIRS, where to find json.h, etc.
+#  JSONCPP_LIBRARIES, the libraries needed to use jsoncpp.
+#  JSONCPP_FOUND, If false, do not try to use jsoncpp.
+#  also defined, but not for general use are
+#  JSONCPP_LIBRARIES, where to find the jsoncpp library.
+
+FIND_PATH(JSONCPP_INCLUDE_DIRS json/json.h
+        /usr/include
+        /usr/local/include
+        ${CMAKE_SOURCE_DIR}/win32-deps/include
+        PATH_SUFFIXES jsoncpp/json jsoncpp
+        )
+
+
+FIND_LIBRARY(JSONCPP_LIBRARIES NAMES jsoncpp HINTS /usr/lib /usr/local/lib 	${CMAKE_SOURCE_DIR}/win32-deps/lib)
+
+IF (JSONCPP_LIBRARIES AND JSONCPP_INCLUDE_DIRS)
+    SET(JSONCPP_LIBRARIES ${JSONCPP_LIBRARIES})
+    SET(JSONCPP_FOUND "YES")
+ELSE (JSONCPP_LIBRARIES AND JSONCPP_INCLUDE_DIRS)
+    SET(JSONCPP_FOUND "NO")
+ENDIF (JSONCPP_LIBRARIES AND JSONCPP_INCLUDE_DIRS)
+
+
+IF (JSONCPP_FOUND)
+    IF (NOT JSONCPP_FIND_QUIETLY)
+        MESSAGE(STATUS "Found JSONCpp: ${JSONCPP_LIBRARIES}")
+    ENDIF (NOT JSONCPP_FIND_QUIETLY)
+ELSE (JSONCPP_FOUND)
+    IF (JSONCPP_FIND_REQUIRED)
+        MESSAGE(FATAL_ERROR "Could not find JSONCPP library include: ${JSONCPP_INCLUDE_DIRS}, lib: ${JSONCPP_LIBRARIES}")
+    ENDIF (JSONCPP_FIND_REQUIRED)
+ENDIF (JSONCPP_FOUND)
+
+# Deprecated declarations.
+SET (NATIVE_JSONCPP_INCLUDE_PATH ${JSONCPP_INCLUDE_DIRS} )
+GET_FILENAME_COMPONENT (NATIVE_JSONCPP_LIB_PATH ${JSONCPP_LIBRARIES} PATH)
+
+MARK_AS_ADVANCED(
+        JSONCPP_LIBRARIES
+        JSONCPP_INCLUDE_DIRS
+)

src/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(.)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -I${JSONCPP_INCLUDE_DIRS}")
 set(SOURCE_FILES
   main.cpp
   Interface/MainClass.cpp
@@ -12,6 +12,8 @@ set(SOURCE_FILES
   DataAccess/PdnsSlaveConfig.h
   DataAccess/HostsConfig.cpp
   DataAccess/HostsConfig.h
+  DataAccess/MySql.cpp
+  DataAccess/MySql.h
   DBO/CommandLineOption.cpp
   DBO/CommandLineOption.h
   DBO/SqlConfiguration.cpp
@@ -28,7 +30,7 @@ set(SOURCE_FILES
   DBO/Actions/ActionDelDomain.h
   DBO/Actions/ActionAddDomain.cpp
   DBO/Actions/ActionAddDomain.h
-  )
+        DataAccess/AbstractSql.cpp DataAccess/AbstractSql.h)
 set(LIBS ${LIBS} jsoncpp)
-add_executable(pdns-slave ${SOURCE_FILES} DataAccess/MySql.cpp DataAccess/MySql.h)
+add_executable(pdns-slave ${SOURCE_FILES})
 target_link_libraries(pdns-slave ${LIBS})