refactor: Store libraries in lib/

This commit is contained in:
Michael Carlberg 2016-06-23 23:54:23 +02:00
parent 825b47b7d4
commit 821e6f4256
6 changed files with 8 additions and 8 deletions

8
.gitmodules vendored
View File

@ -2,10 +2,10 @@
path = contrib/lemonbar-sm-git path = contrib/lemonbar-sm-git
url = https://github.com/jaagr/bar url = https://github.com/jaagr/bar
branch = v1.1 branch = v1.1
[submodule "contrib/i3ipcpp"] [submodule "lib/i3ipcpp"]
path = contrib/i3ipcpp path = lib/i3ipcpp
url = https://github.com/jaagr/i3ipcpp url = https://github.com/jaagr/i3ipcpp
branch = v0.1.3 branch = v0.1.3
[submodule "contrib/xpp"] [submodule "lib/xpp"]
path = contrib/xpp path = lib/xpp
url = https://github.com/jaagr/xpp url = https://github.com/jaagr/xpp

View File

@ -82,7 +82,7 @@ set(PROJECT_LINK_LIBS
if(ENABLE_I3) if(ENABLE_I3)
find_program(I3_EXECUTABLE "i3") find_program(I3_EXECUTABLE "i3")
if(I3_EXECUTABLE) if(I3_EXECUTABLE)
add_subdirectory("${PROJECT_SOURCE_DIR}/contrib/i3ipcpp" EXCLUDE_FROM_ALL) add_subdirectory("${PROJECT_SOURCE_DIR}/lib/i3ipcpp" EXCLUDE_FROM_ALL)
set(PROJECT_INCL_DIRS set(PROJECT_INCL_DIRS
${PROJECT_INCL_DIRS} ${PROJECT_INCL_DIRS}
${SIGCPP_INCLUDE_DIRS} ${SIGCPP_INCLUDE_DIRS}
@ -135,7 +135,7 @@ endif()
# Load the xpp library # Load the xpp library
# #
set(XCB_PROTOS xproto randr) set(XCB_PROTOS xproto randr)
add_subdirectory("${PROJECT_SOURCE_DIR}/contrib/xpp") add_subdirectory("${PROJECT_SOURCE_DIR}/lib/xpp")
set(PROJECT_INCL_DIRS ${PROJECT_INCL_DIRS} ${XPP_INCLUDE_DIRS}) set(PROJECT_INCL_DIRS ${PROJECT_INCL_DIRS} ${XPP_INCLUDE_DIRS})
set(PROJECT_LINK_LIBS ${PROJECT_LINK_LIBS} ${XPP_LIBRARIES}) set(PROJECT_LINK_LIBS ${PROJECT_LINK_LIBS} ${XPP_LIBRARIES})

@ -1 +0,0 @@
Subproject commit ec2d88919d5037360e61932492eb3f98f9b9df28

@ -1 +0,0 @@
Subproject commit ce5a2d1e2fadb909aca62c6ddb9675c2f08873b2

1
lib/i3ipcpp Submodule

@ -0,0 +1 @@
Subproject commit 2094ac2215beb27940355143a89304794129b27e

1
lib/xpp Submodule

@ -0,0 +1 @@
Subproject commit e5fe00e29482a1aaed205ce96f242afb2378f798