Add cmake build for tests

karekoho · Jul 22, 2017 · 176e9f3 · 176e9f3
1 parent 886b45c
commit 176e9f3
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 24 deletions.
diff --git a/build/tests/CMakeLists.txt b/build/tests/CMakeLists.txt
@@ -0,0 +1,35 @@
+cmake_minimum_required(VERSION 3.0.2)
+project(tests_release)
+set(CMAKE_BUILD_TYPE Release)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(PATH "../../src/tests/")
+set(SOURCES
+    ${PATH}main.cpp
+    ${PATH}json_array_iterator_test.h
+    ${PATH}json_exception_test.h
+    ${PATH}json_mock_value.h
+    ${PATH}json_object_iterator_test.h
+    ${PATH}json_test.h
+    ${PATH}json_value_test_interface.h
+    ${PATH}unit_test.h
+    ${PATH}json_array_test.h
+    ${PATH}json_leaf_iterator_test.h
+    ${PATH}json_null_test.h
+    ${PATH}json_object_test.h
+    ${PATH}json_undefined_test.h
+    ${PATH}test_selector.h
+    ${PATH}json_boolean_test.h
+    ${PATH}json_leaf_test.h
+    ${PATH}json_number_test.h
+    ${PATH}json_string_test.h
+    ${PATH}json_value_test.h
+    ${PATH}test_selector_test.h)
+
+find_library (CPPUNIT_LIB cppunit)
+find_library (JSON_LIB json)
+
+message(${CPPUNIT_LIB})
+message(${JSON_LIB})
+
+add_executable (tests_release ${SOURCES})
+target_link_libraries (tests_release ${CPPUNIT_LIB} ${JSON_LIB})
diff --git a/src/tests/json_exception_test.h b/src/tests/json_exception_test.h
@@ -1,7 +1,7 @@
 #ifndef JSON_EXCEPTION_TEST
 #define JSON_EXCEPTION_TEST
 
-#include <unit_test.h>
+#include "unit_test.h"
 #include "json_exception_test.h"
 
 /**

diff --git a/src/tests/json_test.h b/src/tests/json_test.h
@@ -1,7 +1,7 @@
 #ifndef JSON_TEST_H
 #define JSON_TEST_H
 
-#include <json_value_test_interface.h>
+#include "json_value_test_interface.h"
 #include "json_mock_value.h"
 
 namespace format

diff --git a/src/tests/json_value_test.h b/src/tests/json_value_test.h
@@ -1,7 +1,7 @@
 #ifndef JSON_INTERFACE_TEST_H
 #define JSON_INTERFACE_TEST_H
 
-#include <json_value_test_interface.h>
+#include "json_value_test_interface.h"
 #include "json_mock_value.h"
 
 namespace format

diff --git a/src/tests/json_value_test_interface.h b/src/tests/json_value_test_interface.h
@@ -1,7 +1,7 @@
 #ifndef JSON_VALUE_TEST_H
 #define JSON_VALUE_TEST_H
 
-#include <unit_test.h>
+#include "unit_test.h"
 
 /**
  * @brief The json_value_test_interface class

diff --git a/src/tests/main.cpp b/src/tests/main.cpp
@@ -1,19 +1,19 @@
-#include <unit_test.h>
-#include <json_value_test.h>
-#include <json_test.h>
-#include <json_object_test.h>
-#include <json_string_test.h>
-#include <json_array_test.h>
-#include <json_number_test.h>
-#include <json_boolean_test.h>
-#include <json_null_test.h>
-#include <json_undefined_test.h>
-#include <json_leaf_test.h>
-#include <json_object_iterator_test.h>
-#include <json_array_iterator_test.h>
-#include <json_leaf_iterator_test.h>
-#include <test_selector_test.h>
-#include <json_exception_test.h>
+#include "unit_test.h"
+#include "json_value_test.h"
+#include "json_test.h"
+#include "json_object_test.h"
+#include "json_string_test.h"
+#include "json_array_test.h"
+#include "json_number_test.h"
+#include "json_boolean_test.h"
+#include "json_null_test.h"
+#include "json_undefined_test.h"
+#include "json_leaf_test.h"
+#include "json_object_iterator_test.h"
+#include "json_array_iterator_test.h"
+#include "json_leaf_iterator_test.h"
+#include "test_selector_test.h"
+#include "json_exception_test.h"
 
 #include <cstdlib>
 

diff --git a/src/tests/test_selector.h b/src/tests/test_selector.h
@@ -1,7 +1,7 @@
 #ifndef TEST_SELECTOR
 #define TEST_SELECTOR
 
-#include <unit_test.h>
+#include "unit_test.h"
 
 #include <vector>
 #include <cstring>

diff --git a/src/tests/tests.pro b/src/tests/tests.pro
@@ -6,8 +6,6 @@ LIBS += -L/usr/local/lib -lcppunit
 
 QMAKE_CXXFLAGS+= -std=c++11
 QMAKE_LFLAGS +=  -std=c++11
-#QMAKE_CXXFLAGS+= -std=c++14
-#QMAKE_LFLAGS +=  -std=c++14
 
 TARGET = tests_development
 CONFIG += console
@@ -61,5 +59,8 @@ HEADERS += \
 SUBDIRS += \
     ../json/json.pro
 
+DISTFILES += \
+    ../../build/tests/CMakeLists.txt
+
 
 
diff --git a/src/tests/unit_test.h b/src/tests/unit_test.h
@@ -14,7 +14,8 @@
 #include <array>
 #include <wchar.h>
 
-#include "../json/json.h"
+//#include "../json/json.h"
+#include <format/json.h>
 
 #define PASS  0
 #define FAIL  1