Skip to content

Commit abf406c

Browse files
juergengehringjuergengehring
committed
CommonAPI-Tools 3.1.11
1 parent 4f5b9fe commit abf406c

File tree

76 files changed

+1201
-400
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1201
-400
lines changed

‎CommonAPI-Examples/E01HelloWorld/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ OPTION(USE_INSTALLED_COMMONAPI "Set to OFF to use the local (build tree) version
4646
message(STATUS "USE_INSTALLED_COMMONAPI is set to value: ${USE_INSTALLED_COMMONAPI}")
4747

4848
if ("${USE_INSTALLED_COMMONAPI}" STREQUAL "ON")
49-
FIND_PACKAGE(CommonAPI 3.1.10 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
50-
FIND_PACKAGE(CommonAPI-DBus 3.1.10 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
49+
FIND_PACKAGE(CommonAPI 3.1.11 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
50+
FIND_PACKAGE(CommonAPI-DBus 3.1.11 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
5151
else()
52-
FIND_PACKAGE(CommonAPI 3.1.10 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
53-
FIND_PACKAGE(CommonAPI-DBus 3.1.10 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
52+
FIND_PACKAGE(CommonAPI 3.1.11 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
53+
FIND_PACKAGE(CommonAPI-DBus 3.1.11 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
5454
endif()
5555

5656
message(STATUS "CommonAPI_CONSIDERED_CONFIGS: ${CommonAPI_CONSIDERED_CONFIGS}")
@@ -78,8 +78,8 @@ else()
7878
endif()
7979

8080
# SOME/IP
81-
find_package (CommonAPI-SomeIP 3.1.10 REQUIRED)
82-
find_package (vsomeip 2.5.0 REQUIRED)
81+
find_package (CommonAPI-SomeIP 3.1.11 REQUIRED)
82+
find_package (vsomeip 2.5.3 REQUIRED)
8383

8484
# Source Files
8585
set(PRJ_SRC_PATH src)

‎CommonAPI-Examples/E01HelloWorld/src/E01HelloWorldClient.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <iostream>
77
#include <string>
88

9-
#ifndef WIN32
9+
#ifndef _WIN32
1010
#include <unistd.h>
1111
#endif
1212

‎CommonAPI-Examples/E02Attributes/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ OPTION(USE_INSTALLED_COMMONAPI "Set to OFF to use the local (build tree) version
4646
message(STATUS "USE_INSTALLED_COMMONAPI is set to value: ${USE_INSTALLED_COMMONAPI}")
4747

4848
if ("${USE_INSTALLED_COMMONAPI}" STREQUAL "ON")
49-
FIND_PACKAGE(CommonAPI 3.1.10 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
50-
FIND_PACKAGE(CommonAPI-DBus 3.1.10 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
49+
FIND_PACKAGE(CommonAPI 3.1.11 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
50+
FIND_PACKAGE(CommonAPI-DBus 3.1.11 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
5151
else()
52-
FIND_PACKAGE(CommonAPI 3.1.10 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
53-
FIND_PACKAGE(CommonAPI-DBus 3.1.10 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
52+
FIND_PACKAGE(CommonAPI 3.1.11 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
53+
FIND_PACKAGE(CommonAPI-DBus 3.1.11 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
5454
endif()
5555

5656
message(STATUS "CommonAPI_CONSIDERED_CONFIGS: ${CommonAPI_CONSIDERED_CONFIGS}")
@@ -78,8 +78,8 @@ else()
7878
endif()
7979

8080
# SOME/IP
81-
find_package (CommonAPI-SomeIP 3.1.10 REQUIRED)
82-
find_package (vsomeip 2.5.0 REQUIRED)
81+
find_package (CommonAPI-SomeIP 3.1.11 REQUIRED)
82+
find_package (vsomeip 2.5.3 REQUIRED)
8383

8484
# Source Files
8585
set(PRJ_SRC_PATH src)

‎CommonAPI-Examples/E02Attributes/src/E02AttributesClient.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include <iostream>
77

8-
#ifndef WIN32
8+
#ifndef _WIN32
99
#include <unistd.h>
1010
#endif
1111

‎CommonAPI-Examples/E03Methods/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ OPTION(USE_INSTALLED_COMMONAPI "Set to OFF to use the local (build tree) version
4848
message(STATUS "USE_INSTALLED_COMMONAPI is set to value: ${USE_INSTALLED_COMMONAPI}")
4949

5050
if ("${USE_INSTALLED_COMMONAPI}" STREQUAL "ON")
51-
FIND_PACKAGE(CommonAPI 3.1.10 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
52-
FIND_PACKAGE(CommonAPI-DBus 3.1.10 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
51+
FIND_PACKAGE(CommonAPI 3.1.11 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
52+
FIND_PACKAGE(CommonAPI-DBus 3.1.11 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
5353
else()
54-
FIND_PACKAGE(CommonAPI 3.1.10 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
55-
FIND_PACKAGE(CommonAPI-DBus 3.1.10 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
54+
FIND_PACKAGE(CommonAPI 3.1.11 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
55+
FIND_PACKAGE(CommonAPI-DBus 3.1.11 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
5656
endif()
5757

5858
message(STATUS "CommonAPI_CONSIDERED_CONFIGS: ${CommonAPI_CONSIDERED_CONFIGS}")
@@ -80,8 +80,8 @@ else()
8080
endif()
8181

8282
# SOME/IP
83-
find_package (CommonAPI-SomeIP 3.1.10 REQUIRED)
84-
find_package (vsomeip 2.5.0 REQUIRED)
83+
find_package (CommonAPI-SomeIP 3.1.11 REQUIRED)
84+
find_package (vsomeip 2.5.3 REQUIRED)
8585

8686
# Source Files
8787
set(PRJ_SRC_PATH src)

‎CommonAPI-Examples/E03Methods/src/E03MethodsClient.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include <iostream>
99

10-
#ifndef WIN32
10+
#ifndef _WIN32
1111
#include <unistd.h>
1212
#endif
1313

‎CommonAPI-Examples/E04PhoneBook/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ OPTION(USE_INSTALLED_COMMONAPI "Set to OFF to use the local (build tree) version
4848
message(STATUS "USE_INSTALLED_COMMONAPI is set to value: ${USE_INSTALLED_COMMONAPI}")
4949

5050
if ("${USE_INSTALLED_COMMONAPI}" STREQUAL "ON")
51-
FIND_PACKAGE(CommonAPI 3.1.10 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
52-
FIND_PACKAGE(CommonAPI-DBus 3.1.10 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
51+
FIND_PACKAGE(CommonAPI 3.1.11 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
52+
FIND_PACKAGE(CommonAPI-DBus 3.1.11 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
5353
else()
54-
FIND_PACKAGE(CommonAPI 3.1.10 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
55-
FIND_PACKAGE(CommonAPI-DBus 3.1.10 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
54+
FIND_PACKAGE(CommonAPI 3.1.11 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
55+
FIND_PACKAGE(CommonAPI-DBus 3.1.11 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
5656
endif()
5757

5858
message(STATUS "CommonAPI_CONSIDERED_CONFIGS: ${CommonAPI_CONSIDERED_CONFIGS}")
@@ -80,8 +80,8 @@ else()
8080
endif()
8181

8282
# SOME/IP
83-
find_package (CommonAPI-SomeIP 3.1.10 REQUIRED)
84-
find_package (vsomeip 2.5.0 REQUIRED)
83+
find_package (CommonAPI-SomeIP 3.1.11 REQUIRED)
84+
find_package (vsomeip 2.5.3 REQUIRED)
8585

8686
# Source Files
8787
set(PRJ_SRC_PATH src)

‎CommonAPI-Examples/E04PhoneBook/src/E04PhoneBookClient.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* License, v. 2.0. If a copy of the MPL was not distributed with this
66
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
77

8-
#ifndef WIN32
8+
#ifndef _WIN32
99
#include <unistd.h>
1010
#endif
1111

‎CommonAPI-Examples/E05Manager/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ OPTION(USE_INSTALLED_COMMONAPI "Set to OFF to use the local (build tree) version
4646
message(STATUS "USE_INSTALLED_COMMONAPI is set to value: ${USE_INSTALLED_COMMONAPI}")
4747

4848
if ("${USE_INSTALLED_COMMONAPI}" STREQUAL "ON")
49-
FIND_PACKAGE(CommonAPI 3.1.10 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
50-
FIND_PACKAGE(CommonAPI-DBus 3.1.10 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
49+
FIND_PACKAGE(CommonAPI 3.1.11 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
50+
FIND_PACKAGE(CommonAPI-DBus 3.1.11 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
5151
else()
52-
FIND_PACKAGE(CommonAPI 3.1.10 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
53-
FIND_PACKAGE(CommonAPI-DBus 3.1.10 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
52+
FIND_PACKAGE(CommonAPI 3.1.11 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
53+
FIND_PACKAGE(CommonAPI-DBus 3.1.11 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
5454
endif()
5555

5656
message(STATUS "CommonAPI_CONSIDERED_CONFIGS: ${CommonAPI_CONSIDERED_CONFIGS}")
@@ -78,8 +78,8 @@ else()
7878
endif()
7979

8080
# SOME/IP
81-
find_package (CommonAPI-SomeIP 3.1.10 REQUIRED)
82-
find_package (vsomeip 2.5.0 REQUIRED)
81+
find_package (CommonAPI-SomeIP 3.1.11 REQUIRED)
82+
find_package (vsomeip 2.5.3 REQUIRED)
8383

8484
# Source Files
8585
set(PRJ_SRC_PATH src)

‎CommonAPI-Examples/E05Manager/src/E05ManagerClient.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* License, v. 2.0. If a copy of the MPL was not distributed with this
66
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
77

8-
#ifndef WIN32
8+
#ifndef _WIN32
99
#include <unistd.h>
1010
#endif
1111

0 commit comments

Comments
 (0)