mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-22 21:43:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

sci-libs/dart: add 6.12.1

Browse Source 
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
This commit is contained in:
Alessandro Barbieri
2022-03-27 22:26:32 +02:00
parent 87ca18267c
commit ef1f64452b
6 changed files with 355 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sci-libs/dart/files/dart-6.12.1-respect-cflags.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -208,7 +208,7 @@
if(GCC_VERSION VERSION_LESS 7.3.0)
message(FATAL_ERROR "The installed g++ version is ${GCC_VERSION}. ${PROJECT_NAME} requires g++ 7.3.0 or greater.")
endif()
- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
+ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG")
set(CMAKE_CXX_FLAGS_DEBUG "-g -fno-omit-frame-pointer -fno-inline-functions -fno-inline-functions-called-once -fno-optimize-sibling-calls")
if(DART_FAST_DEBUG)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O1")

31
sci-libs/dart/files/dart-6.12.1-use-system-gtest.patch Normal file
View File

@@ -0,0 +1,31 @@
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -31,18 +31,7 @@
#
# GoogleTest setup
-include_directories(BEFORE SYSTEM ${DART_SOURCE_DIR}/unittests/gtest/include)
-include_directories(BEFORE SYSTEM ${DART_SOURCE_DIR}/unittests/gtest)
-add_library(gtest STATIC gtest/src/gtest-all.cc)
-add_library(gtest_main STATIC gtest/src/gtest_main.cc)
-target_link_libraries(gtest_main gtest)
-if(NOT WIN32)
- target_link_libraries(gtest pthread)
-endif()
-set_target_properties(
- gtest PROPERTIES
- ARCHIVE_OUTPUT_DIRECTORY ${DART_BINARY_DIR}/lib
-)
+include_directories(BEFORE SYSTEM /usr/include/gtest)
#===============================================================================
# This function uses following global properties:
@@ -66,7 +55,7 @@
add_executable(${target_name} ${sources})
add_test(${target_name} ${target_name})
- target_link_libraries(${target_name} dart gtest gtest_main)
+ target_link_libraries(${target_name} dart gtest)
dart_format_add(${sources})

149
sci-libs/dart/files/dart-6.12.1-use-system-lodepng-imgui.patch Normal file
View File

@@ -0,0 +1,149 @@
--- a/dart/external/CMakeLists.txt
+++ b/dart/external/CMakeLists.txt
@@ -1,5 +1,3 @@
add_subdirectory(convhull_3d)
-add_subdirectory(imgui)
add_subdirectory(ikfast)
-add_subdirectory(lodepng)
add_subdirectory(odelcpsolver)
--- a/dart/gui/CMakeLists.txt
+++ b/dart/gui/CMakeLists.txt
@@ -42,14 +42,15 @@
dart_add_library(${target_name}
${hdrs} ${srcs} ${dart_gui_headers} ${dart_gui_sources}
)
+target_include_directories(${target_name} PRIVATE /usr/include/imgui)
target_link_libraries(${target_name}
PUBLIC
dart-utils
OpenGL::GL
OpenGL::GLU
GLUT::GLUT
- ${PROJECT_NAME}-external-lodepng
- ${PROJECT_NAME}-external-imgui
+ -limgui
+ lodepng
)
# Component
@@ -59,8 +60,6 @@
${PROJECT_NAME}
${component_name}
utils
- external-lodepng
- external-imgui
)
add_component_dependency_packages(${PROJECT_NAME} ${component_name} OpenGL)
if(NOT WIN32 OR CYGWIN)
--- a/dart/gui/glut/GlutWindow.cpp
+++ b/dart/gui/glut/GlutWindow.cpp
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include "dart/external/lodepng/lodepng.h"
+#include "lodepng.h"
#include "dart/gui/glut/Window.hpp"
#ifdef _WIN32
--- a/dart/gui/osg/ImGuiHandler.cpp
+++ b/dart/gui/osg/ImGuiHandler.cpp
@@ -44,8 +44,8 @@
#include <osg/RenderInfo>
#include "dart/common/Console.hpp"
-#include "dart/external/imgui/imgui.h"
-#include "dart/external/imgui/imgui_impl_opengl2.h"
+#include "imgui/imgui.h"
+#include "imgui/imgui_impl_opengl2.h"
#include "dart/gui/osg/ImGuiWidget.hpp"
namespace dart {
--- a/dart/gui/osg/ImGuiWidget.cpp
+++ b/dart/gui/osg/ImGuiWidget.cpp
@@ -38,7 +38,7 @@
#include "dart/gui/osg/ImGuiWidget.hpp"
-#include "dart/external/imgui/imgui.h"
+#include "imgui/imgui.h"
namespace dart {
namespace gui {
--- a/examples/atlas_simbicon/AtlasSimbiconWidget.cpp
+++ b/examples/atlas_simbicon/AtlasSimbiconWidget.cpp
@@ -38,7 +38,7 @@
#include "AtlasSimbiconWidget.hpp"
-#include "dart/external/imgui/imgui.h"
+#include "imgui/imgui.h"
#include "AtlasSimbiconWorldNode.hpp"
--- a/examples/box_stacking/main.cpp
+++ b/examples/box_stacking/main.cpp
@@ -33,7 +33,7 @@
#include <iostream>
#include <dart/dart.hpp>
-#include <dart/external/imgui/imgui.h>
+#include "imgui/imgui.h"
#include <dart/gui/osg/osg.hpp>
#include <dart/utils/utils.hpp>
--- a/examples/fetch/main.cpp
+++ b/examples/fetch/main.cpp
@@ -32,7 +32,7 @@
#include <dart/collision/bullet/bullet.hpp>
#include <dart/dart.hpp>
-#include <dart/external/imgui/imgui.h>
+#include "imgui/imgui.h"
#include <dart/gui/osg/osg.hpp>
#include <dart/utils/utils.hpp>
--- a/examples/heightmap/main.cpp
+++ b/examples/heightmap/main.cpp
@@ -33,7 +33,7 @@
#include <cmath>
#include <dart/dart.hpp>
-#include <dart/external/imgui/imgui.h>
+#include "imgui/imgui.h"
#include <dart/gui/osg/osg.hpp>
#include <dart/utils/urdf/urdf.hpp>
#include <dart/utils/utils.hpp>
--- a/examples/imgui/main.cpp
+++ b/examples/imgui/main.cpp
@@ -31,7 +31,7 @@
*/
#include <dart/dart.hpp>
-#include <dart/external/imgui/imgui.h>
+#include "imgui/imgui.h"
#include <dart/gui/osg/osg.hpp>
//==============================================================================
--- a/examples/point_cloud/main.cpp
+++ b/examples/point_cloud/main.cpp
@@ -33,7 +33,7 @@
#include <cmath>
#include <dart/dart.hpp>
-#include <dart/external/imgui/imgui.h>
+#include "imgui/imgui.h"
#include <dart/gui/osg/osg.hpp>
#include <dart/utils/urdf/urdf.hpp>
#include <dart/utils/utils.hpp>
--- a/examples/tinkertoy/TinkertoyWidget.cpp
+++ b/examples/tinkertoy/TinkertoyWidget.cpp
@@ -38,7 +38,7 @@
#include "TinkertoyWidget.hpp"
-#include "dart/external/imgui/imgui.h"
+#include "imgui/imgui.h"
#include "TinkertoyWorldNode.hpp"