Mercurial > malikania

diff libcommon/CMakeLists.txt @ 34:3a6769c1d1e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Misc: use nlohmann json, #520
author David Demelier <markand@malikania.fr>
date Wed, 29 Jun 2016 19:44:19 +0200
parents d4f5f7231b84
children 9af360f34c7d
line wrap: on
line diff
--- a/libcommon/CMakeLists.txt	Fri Jun 17 13:12:35 2016 +0200
+++ b/libcommon/CMakeLists.txt	Wed Jun 29 19:44:19 2016 +0200
@@ -25,7 +25,6 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/malikania/id.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/malikania/js.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/malikania/js-elapsed-timer.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/json.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources-loader.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources-locator.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/malikania/util.hpp
@@ -36,7 +35,6 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/malikania/application.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/malikania/elapsed-timer.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/malikania/js-elapsed-timer.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/json.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources-loader.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources-locator.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/malikania/util.cpp
@@ -64,7 +62,7 @@
         ${CMAKE_CURRENT_SOURCE_DIR}
         ${INCLUDES}
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/malikania>
-    LIBRARIES extern-jansson ${LIBRARIES}
+    LIBRARIES json ${LIBRARIES}
 )
 
 set_target_properties(libcommon PROPERTIES PREFIX "")