Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Supress msvc dll exported interface warning #263

Merged
merged 6 commits into from
May 29, 2024
Merged

Supress msvc dll exported interface warning #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9328659
Supress msvc dll exported interface warning
Blast545 May 29, 2024
7ba196f
Add missing linked library
Blast545 May 29, 2024
3b3ac97
Add missing linked library
Blast545 May 29, 2024
7e96682
Add mising linked library
Blast545 May 29, 2024
6fc397b
Add linked library
Blast545 May 29, 2024
456f357
Add missing linked library
Blast545 May 29, 2024
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/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
PRIVATE
ignition-common${IGN_COMMON_MAJOR_VER}::ignition-common${IGN_COMMON_MAJOR_VER}
ignition-math${IGN_MATH_MAJOR_VER}::ignition-math${IGN_MATH_MAJOR_VER}
ignition-utils${IGN_UTILS_VER}::core
${BACKWARD_LIBRARIES}
)

Expand Down
6 changes: 3 additions & 3 deletions src/Manager.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <memory>
#include <string>

// #include <ignition/common/SuppressWarning.hh>
#include <ignition/utils/SuppressWarning.hh>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to link against ignition-utils${IGN_UTILS_VER}::core for this to work. You'd add that in

gz-launch/src/CMakeLists.txt

Line 23 in e2a18dd

${BACKWARD_LIBRARIES}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just added it with 7ba196f. But I think the cmd code copies back the Manager.hh source into the cmd folder and then the library is not linked there.

Should I link it there:

gz-launch/src/cmd/CMakeLists.txt

Line 12 in e2a18dd

target_link_libraries(ign PUBLIC
?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, we'll need to link ignition-utils there as well then.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Manager.hh seems to be used in various places, I had to add a few extra link includes, CI seems to be happy now.


#include <ignition/launch/Export.hh>

Expand Down Expand Up @@ -52,9 +52,9 @@ namespace ignition
public: bool Stop();

/// \brief Private data pointer.
// IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
private: std::unique_ptr<ManagerPrivate> dataPtr;
// IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
};
}
}
Expand Down
4 changes: 3 additions & 1 deletion src/cmd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ target_include_directories(ign PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(ign PUBLIC
${PROJECT_LIBRARY_TARGET_NAME}
ignition-common${IGN_COMMON_MAJOR_VER}::ignition-common${IGN_COMMON_MAJOR_VER}
ignition-utils${IGN_UTILS_VER}::core
)

set(launch_executable ign-launch)
Expand All @@ -20,6 +21,7 @@ target_link_libraries(${launch_executable}
ign
ignition-utils${IGN_UTILS_VER}::cli
ignition-common${IGN_COMMON_MAJOR_VER}::ignition-common${IGN_COMMON_MAJOR_VER}
ignition-utils${IGN_UTILS_VER}::core
)

install(
Expand All @@ -35,7 +37,7 @@ ign_build_tests(TYPE UNIT SOURCES ${gtest_sources}
LIB_DEPS ${EXTRA_TEST_LIB_DEPS})

foreach(test ${test_list})
target_link_libraries(${test} ign)
target_link_libraries(${test} ign ignition-utils${IGN_UTILS_VER}::core)

# Inform each test of its output directory so it knows where to call the
# auxiliary files from. Using a generator expression here is useful for
Expand Down
1 change: 1 addition & 0 deletions test/integration/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ if(NOT WIN32)

ign_build_tests(TYPE INTEGRATION SOURCES ${tests} TEST_LIST test_targets)
foreach(test ${test_targets})
target_link_libraries(${test} ignition-utils${IGN_UTILS_VER}::core)
target_compile_definitions(${test} PRIVATE
"bad_plugins_LIB=\"$<TARGET_FILE:bad_plugins>\"")
endforeach()
Expand Down
Loading