Skip to content
This repository has been archived by the owner on Jun 21, 2023. It is now read-only.

Remove connext workaround #275

Merged
merged 2 commits into from
Dec 15, 2017
Merged

Remove connext workaround #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cacaf8
remove workaround as connext declares dep on libdl now
mikaelarguedas Dec 1, 2017
311e597
flag not necessary for gcc>4.8.2
mikaelarguedas Dec 11, 2017
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
2 changes: 0 additions & 2 deletions connext_cmake_module/cmake/Modules/FindConnext.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,6 @@ if(Connext_FOUND)
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(Connext_LIBRARIES "-Wl,--no-as-needed" ${Connext_LIBRARIES} "-Wl,--as-needed")

# check with which ABI the Connext libraries are built
configure_file(
"${connext_cmake_module_DIR}/check_abi.cmake"
Expand Down
2 changes: 1 addition & 1 deletion connext_cmake_module/cmake/check_abi.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
cmake_minimum_required(VERSION 2.8.3)

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic -Wl,--no-as-needed)
add_compile_options(-Wall -Wextra -Wpedantic)
endif()

include_directories(@Connext_INCLUDE_DIRS@)
Expand Down