This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/cxx in repository https://gitbox.apache.org/repos/asf/celix.git
commit 795217be21ccd225ac38837dda222aa26f213c6f Author: Pepijn Noltes <[email protected]> AuthorDate: Mon Jan 7 10:26:54 2019 +0100 CELIX-438: Adds some missing include statements --- bundles/shell/cxx_shell/gtest/CMakeLists.txt | 4 ++-- cmake/celix_project/AddLibzip.cmake | 2 +- libs/registry/gtest/src/Registry_tests.cc | 1 + libs/registry/gtest/src/Utils_tests.cc | 4 +++- libs/registry/src/ServiceRegistry.cc | 7 +------ 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/bundles/shell/cxx_shell/gtest/CMakeLists.txt b/bundles/shell/cxx_shell/gtest/CMakeLists.txt index c95f364..a163eca 100644 --- a/bundles/shell/cxx_shell/gtest/CMakeLists.txt +++ b/bundles/shell/cxx_shell/gtest/CMakeLists.txt @@ -19,8 +19,8 @@ set(SOURCES src/main.cc src/Shell_tests.cc ) -add_executable(celix_shell_cxx_tests ${SOURCES}) -target_link_libraries(celix_shell_cxx_tests PRIVATE gtest celix_framework_cxx celix_cxx_shell celix_cxx_shell_api glog::glog) +add_executable(celix_cxx_shell_tests ${SOURCES}) +target_link_libraries(celix_cxx_shell_tests PRIVATE gtest celix_framework_cxx celix_cxx_shell celix_cxx_shell_api glog::glog) add_test(NAME celix_cxx_shell_tests COMMAND celix_cxx_shell_tests) SETUP_TARGET_FOR_COVERAGE(celix_cxx_shell_tests_cov celix_cxx_shell_tests ${CMAKE_BINARY_DIR}/coverage/celix_cxx_shell_tests/celix_cxx_shell_tests ..) \ No newline at end of file diff --git a/cmake/celix_project/AddLibzip.cmake b/cmake/celix_project/AddLibzip.cmake index 5b31a79..93ea32a 100644 --- a/cmake/celix_project/AddLibzip.cmake +++ b/cmake/celix_project/AddLibzip.cmake @@ -30,6 +30,6 @@ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/libzip/include) add_library(libzip::libzip IMPORTED STATIC GLOBAL) add_dependencies(libzip::libzip libzip_project) set_target_properties(libzip::libzip PROPERTIES - IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/libzip/lib/libzip.a" + IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/libzip/${CMAKE_INSTALL_LIBDIR}/libzip.a" INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/libzip/include" ) \ No newline at end of file diff --git a/libs/registry/gtest/src/Registry_tests.cc b/libs/registry/gtest/src/Registry_tests.cc index 49941ea..8e371c3 100644 --- a/libs/registry/gtest/src/Registry_tests.cc +++ b/libs/registry/gtest/src/Registry_tests.cc @@ -20,6 +20,7 @@ #include <memory> +#include <climits> #include <gtest/gtest.h> #include <glog/logging.h> diff --git a/libs/registry/gtest/src/Utils_tests.cc b/libs/registry/gtest/src/Utils_tests.cc index 3994109..89c8c62 100644 --- a/libs/registry/gtest/src/Utils_tests.cc +++ b/libs/registry/gtest/src/Utils_tests.cc @@ -17,6 +17,8 @@ *under the License. */ +#include <functional> + #include "gtest/gtest.h" #include "celix/Utils.h" @@ -48,7 +50,7 @@ TEST_F(UtilsTest, svcName) { //TODO EXPECT_EQ("SvcWithFqn[Version 1]", name); name = celix::functionServiceName<std::function<void()>>("do"); - EXPECT_EQ("do[std::function<void()>]", name); + EXPECT_EQ("do [std::function<void()>]", name); name = celix::functionServiceName<std::function<std::vector<std::vector<long>>(long, int, std::vector<double>)>>("collect"); diff --git a/libs/registry/src/ServiceRegistry.cc b/libs/registry/src/ServiceRegistry.cc index b809e8f..33b2bb6 100644 --- a/libs/registry/src/ServiceRegistry.cc +++ b/libs/registry/src/ServiceRegistry.cc @@ -24,12 +24,7 @@ #include <set> #include <utility> #include <future> - -#ifndef __APPLE__ -#include <linux/limits.h> -#else -#include <limits.h> -#endif +#include <climits> #include <glog/logging.h> #include <assert.h>
