From bfc0e30e3552847da302663fb57203797b698c55 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Tue, 21 Nov 2023 14:47:26 +0000 Subject: [PATCH 1/2] Fix DLL linkage/visibility issues Signed-off-by: Michael Carroll --- src/CMakeLists.txt | 4 ++-- src/cmd/runGui_main.cc | 6 ++++++ src/gz.cc | 5 ----- 3 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 src/cmd/runGui_main.cc diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 37486f94cc..f5b9471ef6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -168,8 +168,8 @@ target_link_libraries(${gz_lib_target} ) # Executable target that runs the GUI without ruby for debugging purposes. -add_executable(runGui gz.cc) -target_link_libraries(runGui PRIVATE ${gz_lib_target}) +add_executable(runGui cmd/runGui_main.cc) +target_link_libraries(runGui PRIVATE gz ${gz_lib_target}) # Create the library target gz_create_core_library(SOURCES ${sources} CXX_STANDARD 17) diff --git a/src/cmd/runGui_main.cc b/src/cmd/runGui_main.cc new file mode 100644 index 0000000000..d2f8a5c13e --- /dev/null +++ b/src/cmd/runGui_main.cc @@ -0,0 +1,6 @@ +#include "gz/sim/gui/Gui.hh" + +int main(int argc, char* argv[]) +{ + return gz::sim::gui::runGui(argc, argv, nullptr); +} diff --git a/src/gz.cc b/src/gz.cc index 2d16b52789..cd71e586bf 100644 --- a/src/gz.cc +++ b/src/gz.cc @@ -452,8 +452,3 @@ extern "C" int runGui(const char *_guiConfig, const char *_file, int _waitGui, return gz::sim::gui::runGui( argc, argv, _guiConfig, _file, _waitGui, _renderEngine); } - -int main(int argc, char* argv[]) -{ - return sim::gui::runGui(argc, argv, nullptr); -} From 5e821e001aa4cd105c47c1d83dfba0d30772e7a9 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Tue, 21 Nov 2023 15:51:48 +0000 Subject: [PATCH 2/2] Add copyright and fix link Signed-off-by: Michael Carroll --- src/CMakeLists.txt | 2 +- src/cmd/runGui_main.cc | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f5b9471ef6..8466679071 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -169,7 +169,7 @@ target_link_libraries(${gz_lib_target} # Executable target that runs the GUI without ruby for debugging purposes. add_executable(runGui cmd/runGui_main.cc) -target_link_libraries(runGui PRIVATE gz ${gz_lib_target}) +target_link_libraries(runGui PRIVATE ${gz_lib_target}) # Create the library target gz_create_core_library(SOURCES ${sources} CXX_STANDARD 17) diff --git a/src/cmd/runGui_main.cc b/src/cmd/runGui_main.cc index d2f8a5c13e..0b8aa66d4d 100644 --- a/src/cmd/runGui_main.cc +++ b/src/cmd/runGui_main.cc @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2023 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * +*/ + #include "gz/sim/gui/Gui.hh" int main(int argc, char* argv[])