Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #1484. #1944

Merged
merged 1 commit into from
Apr 30, 2021
Merged

Fixes #1484. #1944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ elseif(NOT EPROSIMA_INSTALLER)
${PROJECT_NAME_UPPER}_SOURCE
BOOST_ASIO_STANDALONE
ASIO_STANDALONE
ASIO_DISABLE_VISIBILITY
SQLITE_WIN32_GETVERSIONEX=0
$<$<AND:$<NOT:$<BOOL:${WIN32}>>,$<STREQUAL:"${CMAKE_BUILD_TYPE}","Debug">>:__DEBUG>
$<$<BOOL:${INTERNAL_DEBUG}>:__INTERNALDEBUG> # Internal debug activated.
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/Makefile.am.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ lib_LTLIBRARIES = lib${PROJECT_NAME}.la
${${PROJECT_NAME}_SOURCES_AUTOTOOLS}
lib${PROJECT_NAME}_la_LDFLAGS = -version-number ${PROJECT_VERSION_AUTOTOOLS} -lpthread -ldl

AM_CPPFLAGS = -DFASTRTPS_SOURCE -DBOOST_ASIO_STANDALONE -DASIO_STANDALONE -I../../include -I../../thirdparty/tinyxml2 -I../../thirdparty/asio
AM_CPPFLAGS = -DFASTRTPS_SOURCE -DBOOST_ASIO_STANDALONE -DASIO_STANDALONE -DASIO_DISABLE_VISIBILITY -I../../include -I../../thirdparty/tinyxml2 -I../../thirdparty/asio

if SECURITY
AM_CPPFLAGS += $(OPENSSL_INCLUDES)
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/asio
Open in desktop
Submodule asio updated 1307 files