Benoit Blanchon пре 11 година
родитељ
комит
8f74e4e44e
3 измењених фајлова са 23 додато и 15 уклоњено
  1. 3 15
      CMakeLists.txt
  2. 3 0
      srcs/CMakeLists.txt
  3. 17 0
      tests/CMakeLists.txt

+ 3 - 15
CMakeLists.txt

@@ -1,19 +1,7 @@
 cmake_minimum_required(VERSION 2.8.4)
 project(ArduinoJson)
 
-file(GLOB_RECURSE SRCS_FILES srcs/*.cpp)
-file(GLOB TESTS_FILES tests/*.cpp)
+enable_testing()
 
-add_library(ArduinoJson ${SRCS_FILES})
-
-include_directories(
-    srcs
-    third-party/gtest-1.7.0
-    third-party/gtest-1.7.0/include)
-
-add_executable(ArduinoJsonTests 
-    ${TESTS_FILES}
-    third-party/gtest-1.7.0/src/gtest-all.cc
-    third-party/gtest-1.7.0/src/gtest_main.cc)
-
-target_link_libraries(ArduinoJsonTests ArduinoJson)
+add_subdirectory(srcs)
+add_subdirectory(tests)

+ 3 - 0
srcs/CMakeLists.txt

@@ -0,0 +1,3 @@
+file(GLOB_RECURSE SRCS_FILES *.cpp)
+
+add_library(ArduinoJson ${SRCS_FILES})

+ 17 - 0
tests/CMakeLists.txt

@@ -0,0 +1,17 @@
+set(GTEST_DIR ../third-party/gtest-1.7.0)
+
+file(GLOB TESTS_FILES *.cpp)
+
+include_directories(
+	../srcs
+    ${GTEST_DIR}
+    ${GTEST_DIR}/include)
+
+add_executable(ArduinoJsonTests 
+    ${TESTS_FILES}
+    ${GTEST_DIR}/src/gtest-all.cc
+    ${GTEST_DIR}/src/gtest_main.cc)
+
+target_link_libraries(ArduinoJsonTests ArduinoJson)
+
+add_test(ArduinoJsonTests ArduinoJsonTests)