From 8b958d6e39f608af46ec3d91e0fa21ea896bc188 Mon Sep 17 00:00:00 2001
From: Sergi Hernandez Juan <shernand@iri.upc.edu>
Date: Thu, 29 Jun 2023 17:33:47 +0200
Subject: [PATCH] Changes to compile in Ubuntu 20.04: osgQT has to be installed
from source.
---
OpenRoadEd/CMakeLists.txt | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/OpenRoadEd/CMakeLists.txt b/OpenRoadEd/CMakeLists.txt
index 3b489e1..c4dc3a7 100644
--- a/OpenRoadEd/CMakeLists.txt
+++ b/OpenRoadEd/CMakeLists.txt
@@ -5,8 +5,11 @@ if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW) # explicitly request new style for passing relative and absolute paths to linker
endif(COMMAND cmake_policy)
+set(CMAKE_PREFIX_PATH "/usr/local/lib64/pkgconfig")
+
find_package(PkgConfig)
-pkg_check_modules(OSG REQUIRED openscenegraph-osg openscenegraph-osgViewer openscenegraph-osgQt)
+pkg_check_modules(OSG REQUIRED openscenegraph-osg openscenegraph-osgViewer)
+pkg_search_module(OSGQT REQUIRED openscenegraph-osgQt)
find_package(Eigen3 REQUIRED)
@@ -139,16 +142,18 @@ set(TARGET_CPP "${CMAKE_SOURCE_DIR}/OpenDrive/OpenDriveXmlWriter.cpp"
"${CMAKE_SOURCE_DIR}/Cephes/polevl.c")
#message("File glob is ${TARGET_H} ${TARGET_CPP}")
-#message("OSG libraries are ${OSG_LIBRARIES}")
+message("OSG libraries are ${OSG_LIBRARIES}")
INCLUDE_DIRECTORIES(Qt)
INCLUDE_DIRECTORIES(Qt/Tree)
INCLUDE_DIRECTORIES(Osg)
INCLUDE_DIRECTORIES(Cephes)
INCLUDE_DIRECTORIES(OpenDrive)
INCLUDE_DIRECTORIES(TinyXML)
-INCLUDE_DIRECTORIES (${EIGEN3_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${OSGQT_INCLUDE_DIRS})
add_executable(openroaded main.cpp create_junction_road.cpp ${CMAKE_SOURCE_DIR}/Qt/convert_resource.cpp ${TARGET_H} ${TARGET_CPP} ../Resources/resources.qrc)
set_property(TARGET openroaded PROPERTY CXX_STANDARD 14)
-target_link_libraries(openroaded ${OSG_LIBRARIES} Qt4::QtGui Qt4::QtXml Qt4::QtCore Qt4::QtOpenGL)
+target_link_libraries(openroaded ${OSG_LIBRARIES} ${OSGQT_LIBRARIES} Qt4::QtGui Qt4::QtXml Qt4::QtCore Qt4::QtOpenGL)
install (TARGETS openroaded RUNTIME DESTINATION bin)
--
GitLab