From efa1825dd6d16e7901e9620c31796b27b6c84ee9 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sat, 14 Mar 2015 17:33:43 +0100
Subject: o Creating a tool to calculate an absolute timestamp from a relative
 timestamp. o Using git submodules instead of CMake's external project.

---
 apps/CMakeLists.txt | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'apps/CMakeLists.txt')

diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index e2082e1..5510cb3 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -1,6 +1,7 @@
 list(APPEND APPS log4cplus-test)
 list(APPEND APPS ble-inspect-device)
 list(APPEND APPS sample-convert)
+list(APPEND APPS sample-timestamp)
 list(APPEND APPS sm-db-insert)
 list(APPEND APPS sm-db-select)
 list(APPEND APPS sm-get-value)
@@ -32,19 +33,9 @@ if(LOG4CPLUS_LIBRARIES MATCHES NOTFOUND)
   message(FATAL_ERROR "Could not find log4cplus library files")
 endif()
 
-include(ExternalProject)
-ExternalProject_Add(
-    JSON
-    PREFIX json
-    GIT_REPOSITORY https://github.com/nlohmann/json.git
-    GIT_TAG ec42245951fceb7594bfb24746c7449986c3c2a4
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND "")
-
 foreach(app ${APPS})
     include_directories("${PROJECT_SOURCE_DIR}/include")
-    include_directories("${CMAKE_BINARY_DIR}/apps/json/src/JSON/src")
+    include_directories("${PROJECT_SOURCE_DIR}/json/src")
 
     add_executable(${app} ${app}.cpp)
 
-- 
cgit v1.2.3