Fix compilation error.
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
cmake_minimum_required(VERSION 2.8.11)
|
||||
cmake_minimum_required (VERSION 3.0)
|
||||
|
||||
#include (libjsoncpp)
|
||||
project(json-cpp)
|
||||
|
||||
project(jsoncpp)
|
||||
set (CMAKE_CXX_STANDARD 11)
|
||||
|
||||
include_directories(include)
|
||||
|
||||
@@ -14,15 +14,15 @@ file(
|
||||
src/lib_json/json_writer.cpp
|
||||
)
|
||||
|
||||
set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -pedantic -Werror=strict-aliasing")
|
||||
set(CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Werror=strict-aliasing")
|
||||
|
||||
add_library(
|
||||
jsoncpp
|
||||
json-cpp
|
||||
SHARED
|
||||
${source_files}
|
||||
)
|
||||
|
||||
install (TARGETS jsoncpp LIBRARY DESTINATION local/lib)
|
||||
install (TARGETS json-cpp LIBRARY DESTINATION local/lib)
|
||||
|
||||
file (GLOB headers include/jsoncpp/*)
|
||||
install (FILES ${headers} DESTINATION include/jsoncpp)
|
||||
|
||||
@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.0)
|
||||
|
||||
project (ubus)
|
||||
|
||||
set (CMAKE_MODULE_PATH "${MODULE_PATH}")
|
||||
|
||||
set(DISABLE_TARGET_OPTIMIZATION ON)
|
||||
|
||||
include_directories ($ENV{SRC_DIR}/src/3P/ubus)
|
||||
|
||||
@@ -40,7 +40,7 @@ add_executable (domod ${source_files})
|
||||
|
||||
target_link_libraries (domod
|
||||
LINK_PUBLIC
|
||||
jsoncpp
|
||||
json-cpp
|
||||
ubus-cpp
|
||||
ubox
|
||||
ubus
|
||||
|
||||
@@ -25,7 +25,7 @@ add_executable (sprinklerd ${source_files})
|
||||
target_link_libraries (sprinklerd
|
||||
LINK_PUBLIC
|
||||
ubus-cpp
|
||||
jsoncpp
|
||||
json-cpp
|
||||
ubox
|
||||
ubus
|
||||
blobmsg_json
|
||||
|
||||
Reference in New Issue
Block a user