diff --git a/.gitmodules b/.gitmodules index 46826c1..916856f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,57 @@ [submodule "lib/boost-config"] path = lib/boost-config url = https://github.com/boostorg/config.git +[submodule "lib/boost-utility"] + path = lib/boost-utility + url = https://github.com/boostorg/utility.git +[submodule "lib/boost-predef"] + path = lib/boost-predef + url = https://github.com/boostorg/predef.git +[submodule "lib/boost-assert"] + path = lib/boost-assert + url = https://github.com/boostorg/assert.git +[submodule "lib/boost-core"] + path = lib/boost-core + url = https://github.com/boostorg/core.git +[submodule "lib/boost-type_traits"] + path = lib/boost-type_traits + url = https://github.com/boostorg/type_traits.git +[submodule "lib/boost-iterator"] + path = lib/boost-iterator + url = https://github.com/boostorg/iterator.git +[submodule "lib/boost-mpl"] + path = lib/boost-mpl + url = https://github.com/boostorg/mpl.git +[submodule "lib/boost-preprocessor"] + path = lib/boost-preprocessor + url = https://github.com/boostorg/preprocessor.git +[submodule "lib/boost-static_assert"] + path = lib/boost-static_assert + url = https://github.com/boostorg/static_assert.git +[submodule "lib/boost-detail"] + path = lib/boost-detail + url = https://github.com/boostorg/detail.git +[submodule "lib/boost-smart_ptr"] + path = lib/boost-smart_ptr + url = https://github.com/boostorg/smart_ptr.git +[submodule "lib/boost-exception"] + path = lib/boost-exception + url = https://github.com/boostorg/exception.git +[submodule "lib/boost-throw_exception"] + path = lib/boost-throw_exception + url = https://github.com/boostorg/throw_exception.git +[submodule "lib/boost-io"] + path = lib/boost-io + url = https://github.com/boostorg/io.git +[submodule "lib/boost-functional"] + path = lib/boost-functional + url = https://github.com/boostorg/functional.git +[submodule "lib/boost-container_hash"] + path = lib/boost-container_hash + url = https://github.com/boostorg/container_hash.git +[submodule "lib/boost-range"] + path = lib/boost-range + url = https://github.com/boostorg/range.git +[submodule "lib/boost-integer"] + path = lib/boost-integer + url = https://github.com/boostorg/integer.git diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index a922c22..79b2a3e 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -18,18 +18,92 @@ if(NOT USE_SYSTEM_BOOST) add_library(boost_config IMPORTED INTERFACE) set_property(TARGET boost_config PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$") + add_library(boost_utility IMPORTED INTERFACE) + set_property(TARGET boost_utility PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$") + set_property(TARGET boost_utility PROPERTY INTERFACE_LINK_LIBRARIES "boost_config") + + add_library(boost_predef IMPORTED INTERFACE) + set_property(TARGET boost_predef PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$") + set_property(TARGET boost_predef PROPERTY INTERFACE_LINK_LIBRARIES "boost_config") + + add_library(boost_assert IMPORTED INTERFACE) + set_property(TARGET boost_assert PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$") + set_property(TARGET boost_assert PROPERTY INTERFACE_LINK_LIBRARIES "boost_config") + + add_library(boost_core IMPORTED INTERFACE) + set_property(TARGET boost_core PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$") + set_property(TARGET boost_core PROPERTY INTERFACE_LINK_LIBRARIES "boost_config") + + add_library(boost_type_traits IMPORTED INTERFACE) + set_property(TARGET boost_type_traits PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$") + set_property(TARGET boost_type_traits PROPERTY INTERFACE_LINK_LIBRARIES "boost_config") + + add_library(boost_iterator IMPORTED INTERFACE) + set_property(TARGET boost_iterator PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$") + set_property(TARGET boost_iterator PROPERTY INTERFACE_LINK_LIBRARIES "boost_config") + + add_library(boost_mpl IMPORTED INTERFACE) + set_property(TARGET boost_mpl PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$") + set_property(TARGET boost_mpl PROPERTY INTERFACE_LINK_LIBRARIES "boost_config") + + add_library(boost_preprocessor IMPORTED INTERFACE) + set_property(TARGET boost_preprocessor PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$") + set_property(TARGET boost_preprocessor PROPERTY INTERFACE_LINK_LIBRARIES "boost_config") + + add_library(boost_static_assert IMPORTED INTERFACE) + set_property(TARGET boost_static_assert PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$") + set_property(TARGET boost_static_assert PROPERTY INTERFACE_LINK_LIBRARIES "boost_config") + + add_library(boost_detail IMPORTED INTERFACE) + set_property(TARGET boost_detail PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$") + set_property(TARGET boost_detail PROPERTY INTERFACE_LINK_LIBRARIES "boost_config") + + add_library(boost_smart_ptr IMPORTED INTERFACE) + set_property(TARGET boost_smart_ptr PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$") + set_property(TARGET boost_smart_ptr PROPERTY INTERFACE_LINK_LIBRARIES "boost_config") + + add_library(boost_throw_exception IMPORTED INTERFACE) + set_property(TARGET boost_throw_exception PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$") + set_property(TARGET boost_throw_exception PROPERTY INTERFACE_LINK_LIBRARIES "boost_config") + + add_library(boost_io IMPORTED INTERFACE) + set_property(TARGET boost_io PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$") + set_property(TARGET boost_io PROPERTY INTERFACE_LINK_LIBRARIES "boost_config") + + add_library(boost_container_hash IMPORTED INTERFACE) + set_property(TARGET boost_container_hash PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$") + set_property(TARGET boost_container_hash PROPERTY INTERFACE_LINK_LIBRARIES "boost_config") + + add_library(boost_functional IMPORTED INTERFACE) + set_property(TARGET boost_functional PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$") + set_property(TARGET boost_functional PROPERTY INTERFACE_LINK_LIBRARIES "boost_config;boost_container_hash") + + add_library(boost_range IMPORTED INTERFACE) + set_property(TARGET boost_range PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$") + set_property(TARGET boost_range PROPERTY INTERFACE_LINK_LIBRARIES "boost_config") + + add_library(boost_integer IMPORTED INTERFACE) + set_property(TARGET boost_integer PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$") + set_property(TARGET boost_integer PROPERTY INTERFACE_LINK_LIBRARIES "boost_config") + file(GLOB boost_system_srcs ${CMAKE_CURRENT_SOURCE_DIR}/boost-system/src/*.cpp) add_library(boost_system STATIC ${boost_system_srcs}) target_include_directories(boost_system PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/boost-system/include) - target_link_libraries(boost_system INTERFACE boost_config) + target_link_libraries(boost_system PUBLIC + boost_config boost_predef boost_assert boost_core boost_type_traits boost_iterator boost_mpl boost_preprocessor + boost_static_assert boost_detail boost_smart_ptr boost_throw_exception boost_io boost_functional boost_range + ) file(GLOB boost_filesystem_srcs ${CMAKE_CURRENT_SOURCE_DIR}/boost-filesystem/src/*.cpp) add_library(boost_filesystem STATIC ${boost_filesystem_srcs}) target_include_directories(boost_filesystem PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/boost-filesystem/include) - target_link_libraries(boost_filesystem INTERFACE boost_config) + target_link_libraries(boost_filesystem PUBLIC boost_config boost_utility boost_system) file(GLOB boost_regex_srcs ${CMAKE_CURRENT_SOURCE_DIR}/boost-regex/src/*.cpp) add_library(boost_regex STATIC ${boost_regex_srcs}) target_include_directories(boost_regex PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/boost-regex/include) - target_link_libraries(boost_regex INTERFACE boost_config) + target_link_libraries(boost_regex PUBLIC + boost_config boost_predef boost_assert boost_throw_exception boost_smart_ptr boost_core boost_mpl + boost_type_traits boost_static_assert boost_integer boost_preprocessor boost_functional boost_detail + ) endif() diff --git a/lib/boost-assert b/lib/boost-assert new file mode 160000 index 0000000..4bd93cd --- /dev/null +++ b/lib/boost-assert @@ -0,0 +1 @@ +Subproject commit 4bd93cd4141b5d48e090495551e3bce931321f62 diff --git a/lib/boost-container_hash b/lib/boost-container_hash new file mode 160000 index 0000000..e73522f --- /dev/null +++ b/lib/boost-container_hash @@ -0,0 +1 @@ +Subproject commit e73522f2969d75ee9154f31c431d1a17df390ed9 diff --git a/lib/boost-core b/lib/boost-core new file mode 160000 index 0000000..9445d08 --- /dev/null +++ b/lib/boost-core @@ -0,0 +1 @@ +Subproject commit 9445d08ea77aefcce683fe80ddfd8a03a0de00bb diff --git a/lib/boost-detail b/lib/boost-detail new file mode 160000 index 0000000..824721a --- /dev/null +++ b/lib/boost-detail @@ -0,0 +1 @@ +Subproject commit 824721a7533de893338ed5bbc8e8d9f4fb1ad716 diff --git a/lib/boost-functional b/lib/boost-functional new file mode 160000 index 0000000..96fbb48 --- /dev/null +++ b/lib/boost-functional @@ -0,0 +1 @@ +Subproject commit 96fbb48b421505ede6a6bddb1f7e688182cbc008 diff --git a/lib/boost-integer b/lib/boost-integer new file mode 160000 index 0000000..66dbc2c --- /dev/null +++ b/lib/boost-integer @@ -0,0 +1 @@ +Subproject commit 66dbc2c70aecc47d5a711b5dac6da6237721a644 diff --git a/lib/boost-io b/lib/boost-io new file mode 160000 index 0000000..5fa66f1 --- /dev/null +++ b/lib/boost-io @@ -0,0 +1 @@ +Subproject commit 5fa66f1f76fb9142765692cc0cf6e40af8d08c45 diff --git a/lib/boost-iterator b/lib/boost-iterator new file mode 160000 index 0000000..b2adecb --- /dev/null +++ b/lib/boost-iterator @@ -0,0 +1 @@ +Subproject commit b2adecb951af025698618f19a3c838bd314966dc diff --git a/lib/boost-mpl b/lib/boost-mpl new file mode 160000 index 0000000..2371f85 --- /dev/null +++ b/lib/boost-mpl @@ -0,0 +1 @@ +Subproject commit 2371f854617f1057dd339e81678186edf0336c0c diff --git a/lib/boost-predef b/lib/boost-predef new file mode 160000 index 0000000..c8c2682 --- /dev/null +++ b/lib/boost-predef @@ -0,0 +1 @@ +Subproject commit c8c26821b9ab850ace7bbaf0d22f347a1486ff6d diff --git a/lib/boost-preprocessor b/lib/boost-preprocessor new file mode 160000 index 0000000..56090c5 --- /dev/null +++ b/lib/boost-preprocessor @@ -0,0 +1 @@ +Subproject commit 56090c56b5c78418b6dbe8c3c2ba576395152f83 diff --git a/lib/boost-range b/lib/boost-range new file mode 160000 index 0000000..b1d5d23 --- /dev/null +++ b/lib/boost-range @@ -0,0 +1 @@ +Subproject commit b1d5d235148eb1736ce87eb34921a670c7cecf81 diff --git a/lib/boost-smart_ptr b/lib/boost-smart_ptr new file mode 160000 index 0000000..605d4a2 --- /dev/null +++ b/lib/boost-smart_ptr @@ -0,0 +1 @@ +Subproject commit 605d4a2789ad61c69c6e450f6770eb011cd8a9a7 diff --git a/lib/boost-static_assert b/lib/boost-static_assert new file mode 160000 index 0000000..afe9e9d --- /dev/null +++ b/lib/boost-static_assert @@ -0,0 +1 @@ +Subproject commit afe9e9d7864e23d50077115d51fa8ce17fc2e8be diff --git a/lib/boost-throw_exception b/lib/boost-throw_exception new file mode 160000 index 0000000..c548923 --- /dev/null +++ b/lib/boost-throw_exception @@ -0,0 +1 @@ +Subproject commit c548923b32735fcbc6cdf34c8e9b382d58b4b407 diff --git a/lib/boost-type_traits b/lib/boost-type_traits new file mode 160000 index 0000000..e34ad30 --- /dev/null +++ b/lib/boost-type_traits @@ -0,0 +1 @@ +Subproject commit e34ad30482d72b2a538093d30cfd22d480eb0866 diff --git a/lib/boost-utility b/lib/boost-utility new file mode 160000 index 0000000..56f1362 --- /dev/null +++ b/lib/boost-utility @@ -0,0 +1 @@ +Subproject commit 56f13625b1f03f6022f7f4f63261867e1a3a9800 diff --git a/src/plugin/CMakeLists.txt b/src/plugin/CMakeLists.txt index 9ce13c0..ad51629 100644 --- a/src/plugin/CMakeLists.txt +++ b/src/plugin/CMakeLists.txt @@ -1,4 +1,4 @@ file(GLOB PLUGIN_HEADERS ${PROJECT_SOURCE_DIR}/include/linuxdeploy/plugin/*.h) add_library(linuxdeploy_plugin STATIC plugin_type0.cpp plugin.cpp ${PLUGIN_HEADERS}) -target_link_libraries(linuxdeploy_plugin PRIVATE linuxdeploy_core ${BOOST_LIBS} subprocess) +target_link_libraries(linuxdeploy_plugin PUBLIC linuxdeploy_core ${BOOST_LIBS} subprocess)