JsonCpp is no more a submodule
This commit is contained in:
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -1,6 +1,3 @@
|
||||
[submodule "3rd/auss"]
|
||||
path = 3rd/auss
|
||||
url = https://github.com/drmgc/auss.git
|
||||
[submodule "3rd/jsoncpp"]
|
||||
path = 3rd/jsoncpp
|
||||
url = https://github.com/open-source-parsers/jsoncpp
|
||||
|
||||
Submodule 3rd/jsoncpp deleted from 9234cbbc90
@@ -4,25 +4,20 @@ project(i3ipc++)
|
||||
option(I3IPCpp_WITH_TESTS "Build unit tests executables" OFF)
|
||||
option(I3IPCpp_BUILD_EXAMPLES "Build example executables" OFF)
|
||||
|
||||
set(BUILD_STATIC_LIBS ON)
|
||||
set(BUILD_SHARED_LIBS OFF)
|
||||
add_subdirectory(3rd/jsoncpp)
|
||||
UNSET(BUILD_STATIC_LIBS)
|
||||
UNSET(BUILD_SHARED_LIBS)
|
||||
|
||||
find_package(PkgConfig)
|
||||
pkg_check_modules(SIGCPP REQUIRED sigc++-2.0)
|
||||
pkg_check_modules(JSONCPP REQUIRED jsoncpp)
|
||||
|
||||
include_directories(
|
||||
${SIGCPP_INCLUDE_DIRS}
|
||||
3rd/jsoncpp/include
|
||||
${JSONCPP_INCLUDE_DIRS}
|
||||
3rd/auss/include
|
||||
include/i3ipc++
|
||||
)
|
||||
|
||||
link_directories(
|
||||
${SIGCPP_LIBRARY_DIRS}
|
||||
3rd/jsoncpp/src/lib_json/
|
||||
${JSONCPP_LIBRARY_DIRS}
|
||||
)
|
||||
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wno-unused-parameter")
|
||||
@@ -38,7 +33,7 @@ set(I3IPCpp_INCLUDE_DIRS
|
||||
3rd/auss/include
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/include/
|
||||
)
|
||||
set(I3IPCpp_LIBRARIES i3ipc++_static ${SIGCPP_LIBRARIES} jsoncpp_lib_static)
|
||||
set(I3IPCpp_LIBRARIES i3ipc++_static ${SIGCPP_LIBRARIES} ${JSONCPP_LIBRARIES})
|
||||
|
||||
set(I3IPCpp_LIBRARY_DIRS ${I3IPCpp_LIBRARY_DIRS} PARENT_SCOPE)
|
||||
set(I3IPCpp_INCLUDE_DIRS ${I3IPCpp_INCLUDE_DIRS} PARENT_SCOPE)
|
||||
|
||||
Reference in New Issue
Block a user