Skip to content

Commit

Permalink
Update core framework, DS, and CA versions (#668)
Browse files Browse the repository at this point in the history
* Updated core framework, DS, and CA versions

Signed-off-by: The MathWorks, Inc. <alchrist@mathworks.com>

* Updated version numbers in examples
  • Loading branch information
achristoforides committed May 13, 2022
1 parent 9ea574b commit 35622cc
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.0
3.7.1
2 changes: 1 addition & 1 deletion compendium/ConfigurationAdmin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ add_compile_definitions(BOOST_DATE_TIME_NO_LIB)
add_compile_definitions(BOOST_REGEX_NO_LIB)

usMacroCreateBundle(ConfigurationAdmin
VERSION "1.1.2"
VERSION "1.3.0"
DEPENDS Framework
TARGET ConfigurationAdmin
SYMBOLIC_NAME configuration_admin
Expand Down
2 changes: 1 addition & 1 deletion compendium/DeclarativeServices/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ add_compile_definitions(BOOST_REGEX_NO_LIB)


usMacroCreateBundle(DeclarativeServices
VERSION "1.2.1"
VERSION "1.3.1"
DEPENDS Framework
TARGET DeclarativeServices
SYMBOLIC_NAME declarative_services
Expand Down
4 changes: 2 additions & 2 deletions doc/src/examples/makefile/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ CXXFLAGS = -g -Wall -Wno-unused -pedantic -fPIC $(US_CXX_FLAGS)
LDFLAGS = -Wl,-rpath="$(CppMicroServices_ROOT)/lib" -Wl,-rpath=.
LDLIBS = "${US_CPPMICROSERVICES_TARGET}"

INCLUDEDIRS = -I"$(CppMicroServices_ROOT)/include/cppmicroservices4"
INCLUDEDIRS = -I"$(CppMicroServices_ROOT)/include/cppmicroservices3"
LIBDIRS = -L"$(CppMicroServices_ROOT)/lib" -L.

RC = "$(CppMicroServices_ROOT)/bin/usResourceCompiler4"
RC = "$(CppMicroServices_ROOT)/bin/usResourceCompiler3"

OBJECTS = bundle.o IDictionaryService.o

Expand Down

0 comments on commit 35622cc

Please sign in to comment.