Jelajahi Sumber

add findqt.cmake and adcpilot.cmake for ros program use qt or adc pilot.

yuchuli 2 tahun lalu
induk
melakukan
c8ac212051

+ 20 - 20
deploy-agx.sh

@@ -11,29 +11,29 @@ if [ "$#" -lt 1 ]; then
 fi
 
 ignore_lib_name=(
-libstdc++.so.*
-libm.so.*
-libgcc_s.so.*
+#libstdc++.so.*
+#libm.so.*
+#libgcc_s.so.*
 libc.so.*
 libpthread.so.*
-libGL.so.*
-libz.so.*
-libgthread*
-libglib*
-libexpat*
-libxcb*
+#libGL.so.*
+#libz.so.*
+#libgthread*
+#libglib*
+#libexpat*
+#libxcb*
 libdl.so.*
-libxshmfence*
-libglapi.so.*
-libXext.so.*
-libXdamage.so.*
-libXfixes.so.*
-libX11*
-libXxf86vm.so.*
-libdrm.so.*
-libpcre.so.*
-libXau.so.*
-libXdmcp.so.*
+#libxshmfence*
+#libglapi.so.*
+#libXext.so.*
+#libXdamage.so.*
+#libXfixes.so.*
+#libX11*
+#libXxf86vm.so.*
+#libdrm.so.*
+#libpcre.so.*
+#libXau.so.*
+#libXdmcp.so.*
 )
 
 EXE="$1"

+ 5 - 4
deploywithfind.sh

@@ -30,18 +30,19 @@ fi
 
 
 ignore_lib_name=(
-#libstdc++.so.*
+libstdc++.so.*
 libm.so.*
-#libgcc_s.so.*
+libgcc_s.so.*
 #libc.so.*
-libpthread.so.*
+#libpthread.so.*
 libGL.so.*
 libz.so.*
+libc.so.*
 libgthread*
 libglib*
 libexpat*
 libxcb*
-libdl.so.*
+#libdl.so.*
 libxshmfence*
 libglapi.so.*
 libXext.so.*

+ 18 - 0
src/ros/catkin/src/adcpilot.cmake

@@ -0,0 +1,18 @@
+
+include(${CMAKE_SOURCE_DIR}/findqt.cmake)
+
+find_path(MODULECOMM_INCLUDE_DIR modulecomm.h  ${CMAKE_SOURCE_DIR}/../../../../include )
+find_library(MODULECOMM_LIBRARAY_DIR  modulecomm  ${CMAKE_SOURCE_DIR}/../../../../bin )
+
+if (MODULECOMM_INCLUDE_DIR  AND  MODULECOMM_LIBRARAY_DIR )
+  message(STATUS  "FIND  modulecomm")
+  include_directories(
+    ${CMAKE_SOURCE_DIR}/../../../../include
+    ${CMAKE_SOURCE_DIR}/../../../../src/include/msgtype
+  )
+  link_directories(
+    ${CMAKE_SOURCE_DIR}/../../../../bin
+)
+  else( )
+    message(FATAL_ERROR "Not Found modulecomm")
+endif ()

+ 1 - 24
src/ros/catkin/src/controllertocan/CMakeLists.txt

@@ -4,30 +4,7 @@ project(controllertocan)
 
 message(STATUS  "Enter controllertocan")
 
-
-SET(QT_PATH  /usr/include/x86_64-linux-gnu/qt5)
-SET(QT2_PATH  /usr/include/x86_64-linux-gnu/qt5)
-SET(AGX_QT_PATH  /usr/include/aarch64-linux-gnu/qt5)
-
-find_path(QT_EXIST   QtCore   ${QT_PATH}/include/QtCore  ${AGX_QT_PATH}/QtCore  ${QT2_PATH}/QtCore)
-
-if(QT_EXIST)
-include_directories(
-  ${QT_PATH}/include
-  ${QT_PATH}/include/QtCore
-  ${AGX_QT_PATH}
-  ${AGX_QT_PATH}/QtCore
-    ${QT2_PATH}
-    ${QT2_PATH}/QtCore
-)
-link_directories(
-  ${QT_PATH}/lib
-)
-else()
-  message(FATAL_ERROR "Please set QT_PATH")
-endif()
-
-
+include(${CMAKE_SOURCE_DIR}/findqt.cmake)
 
 
 ## Find catkin macros and libraries

+ 1 - 21
src/ros/catkin/src/controllertocan_haomo/CMakeLists.txt

@@ -5,27 +5,7 @@ project(controllertocan_haomo)
 message(STATUS  "Enter controllertocan_haomo")
 
 
-SET(QT_PATH  /usr/include/x86_64-linux-gnu/qt5)
-SET(QT2_PATH  /usr/include/x86_64-linux-gnu/qt5)
-SET(AGX_QT_PATH  /usr/include/aarch64-linux-gnu/qt5)
-
-find_path(QT_EXIST   QtCore   ${QT_PATH}/include/QtCore  ${AGX_QT_PATH}/QtCore  ${QT2_PATH}/QtCore)
-
-if(QT_EXIST)
-include_directories(
-  ${QT_PATH}/include
-  ${QT_PATH}/include/QtCore
-  ${AGX_QT_PATH}
-  ${AGX_QT_PATH}/QtCore
-    ${QT2_PATH}
-    ${QT2_PATH}/QtCore
-)
-link_directories(
-  ${QT_PATH}/lib
-)
-else()
-  message(FATAL_ERROR "Please set QT_PATH")
-endif()
+include(${CMAKE_SOURCE_DIR}/findqt.cmake)
 
 
 

+ 1 - 27
src/ros/catkin/src/driver_can_kvaser/CMakeLists.txt

@@ -1,33 +1,7 @@
 cmake_minimum_required(VERSION 2.8.11)
 project(driver_can_kvaser)
 
-
-message(STATUS  "Enter driver_can_kvaser")
-
-
-SET(QT_PATH  /usr/include/x86_64-linux-gnu/qt5)
-SET(QT2_PATH  /usr/include/x86_64-linux-gnu/qt5)
-SET(AGX_QT_PATH  /usr/include/aarch64-linux-gnu/qt5)
-
-find_path(QT_EXIST   QtCore   ${QT_PATH}/include/QtCore  ${AGX_QT_PATH}/QtCore  ${QT2_PATH}/QtCore)
-
-if(QT_EXIST)
-include_directories(
-  ${QT_PATH}/include
-  ${QT_PATH}/include/QtCore
-  ${AGX_QT_PATH}
-  ${AGX_QT_PATH}/QtCore
-    ${QT2_PATH}
-    ${QT2_PATH}/QtCore
-)
-link_directories(
-  ${QT_PATH}/lib
-)
-else()
-  message(FATAL_ERROR "Please set QT_PATH")
-endif()
-
-
+include(${CMAKE_SOURCE_DIR}/findqt.cmake)
 
 
 ## Find catkin macros and libraries

+ 1 - 21
src/ros/catkin/src/driver_can_nvidia/CMakeLists.txt

@@ -5,27 +5,7 @@ project(driver_can_nvidia)
 message(STATUS  "Enter driver_can_nvidia")
 
 
-SET(QT_PATH  /usr/include/x86_64-linux-gnu/qt5)
-SET(QT2_PATH  /usr/include/x86_64-linux-gnu/qt5)
-SET(AGX_QT_PATH  /usr/include/aarch64-linux-gnu/qt5)
-
-find_path(QT_EXIST   QtCore   ${QT_PATH}/include/QtCore  ${AGX_QT_PATH}/QtCore  ${QT2_PATH}/QtCore)
-
-if(QT_EXIST)
-include_directories(
-  ${QT_PATH}/include
-  ${QT_PATH}/include/QtCore
-  ${AGX_QT_PATH}
-  ${AGX_QT_PATH}/QtCore
-    ${QT2_PATH}
-    ${QT2_PATH}/QtCore
-)
-link_directories(
-  ${QT_PATH}/lib
-)
-else()
-  message(FATAL_ERROR "Please set QT_PATH")
-endif()
+include(${CMAKE_SOURCE_DIR}/findqt.cmake)
 
 
 

+ 27 - 0
src/ros/catkin/src/findqt.cmake

@@ -0,0 +1,27 @@
+SET(QT_PATH  /opt/qt/5.13.2/gcc_64)
+SET(QT2_PATH  /usr/include/x86_64-linux-gnu/qt5)
+SET(AGX_QT_PATH  /usr/include/aarch64-linux-gnu/qt5)
+
+find_path(QT_EXIST   QtCore   ${QT_PATH}/include/QtCore  ${AGX_QT_PATH}/QtCore  ${QT2_PATH}/QtCore)
+
+if(QT_EXIST)
+include_directories(
+  ${QT_PATH}/include
+  ${QT_PATH}/include/QtCore
+  ${QT_PATH}/include/QtSerialPort
+  ${QT_PATH}/include/QtNetwork
+  ${AGX_QT_PATH}
+  ${AGX_QT_PATH}/QtCore
+  ${AGX_QT_PATH}/QtSerialPort
+  ${AGX_QT_PATH}/QtNetwork
+  ${QT2_PATH}
+  ${QT2_PATH}/QtCore
+  ${QT2_PATH}/QtSerialPort
+  ${QT2_PATH}/QtNetwork
+)
+link_directories(
+  ${QT_PATH}/lib
+)
+else()
+  message(FATAL_ERROR "Please set QT_PATH")
+endif()

+ 1 - 38
src/ros/catkin/src/pilottoros/CMakeLists.txt

@@ -4,44 +4,7 @@ project(pilottoros)
 
 message(STATUS  "Enter pilottoros")
 
-SET(QT_PATH  /usr/include/x86_64-linux-gnu/qt5)
-SET(QT2_PATH  /usr/include/x86_64-linux-gnu/qt5)
-SET(AGX_QT_PATH  /usr/include/aarch64-linux-gnu/qt5)
-
-find_path(QT_EXIST   QtCore   ${QT_PATH}/include/QtCore  ${AGX_QT_PATH}/QtCore  ${QT2_PATH}/QtCore)
-
-if(QT_EXIST)
-include_directories(
-  ${QT_PATH}/include
-  ${QT_PATH}/include/QtCore
-  ${AGX_QT_PATH}
-  ${AGX_QT_PATH}/QtCore
-    ${QT2_PATH}
-    ${QT2_PATH}/QtCore
-)
-link_directories(
-  ${QT_PATH}/lib
-)
-else()
-  message(FATAL_ERROR "Please set QT_PATH")
-endif()
-
-
-find_path(MODULECOMM_INCLUDE_DIR modulecomm.h  ${CMAKE_SOURCE_DIR}/../../../../include )
-find_library(MODULECOMM_LIBRARAY_DIR  modulecomm  ${CMAKE_SOURCE_DIR}/../../../../bin )
-
-if (MODULECOMM_INCLUDE_DIR  AND  MODULECOMM_LIBRARAY_DIR )
-  message(STATUS  "FIND  modulecomm")
-  include_directories(
-    ${CMAKE_SOURCE_DIR}/../../../../include
-    ${CMAKE_SOURCE_DIR}/../../../../src/include/msgtype
-  )
-  link_directories(
-    ${CMAKE_SOURCE_DIR}/../../../../bin
-)
-  else( )
-    message(FATAL_ERROR "Not Found modulecomm")
-endif ()
+include(${CMAKE_SOURCE_DIR}/adcpilot.cmake)
 
 
 ## Find catkin macros and libraries

+ 1 - 39
src/ros/catkin/src/rostopilot/CMakeLists.txt

@@ -4,45 +4,7 @@ project(rostopilot)
 
 message(STATUS  "Enter rostopilot")
 
-SET(QT_PATH  /usr/include/x86_64-linux-gnu/qt5)
-SET(QT2_PATH  /usr/include/x86_64-linux-gnu/qt5)
-SET(AGX_QT_PATH  /usr/include/aarch64-linux-gnu/qt5)
-
-find_path(QT_EXIST   QtCore   ${QT_PATH}/include/QtCore  ${AGX_QT_PATH}/QtCore  ${QT2_PATH}/QtCore)
-
-if(QT_EXIST)
-include_directories(
-  ${QT_PATH}/include
-  ${QT_PATH}/include/QtCore
-  ${AGX_QT_PATH}
-  ${AGX_QT_PATH}/QtCore
-    ${QT2_PATH}
-    ${QT2_PATH}/QtCore
-)
-link_directories(
-  ${QT_PATH}/lib
-)
-else()
-  message(FATAL_ERROR "Please set QT_PATH")
-endif()
-
-
-find_path(MODULECOMM_INCLUDE_DIR modulecomm.h  ${CMAKE_SOURCE_DIR}/../../../../include )
-find_library(MODULECOMM_LIBRARAY_DIR  modulecomm  ${CMAKE_SOURCE_DIR}/../../../../bin )
-
-if (MODULECOMM_INCLUDE_DIR  AND  MODULECOMM_LIBRARAY_DIR )
-  message(STATUS  "FIND  modulecomm")
-  include_directories(
-    ${CMAKE_SOURCE_DIR}/../../../../include
-    ${CMAKE_SOURCE_DIR}/../../../../src/include/msgtype
-  )
-  link_directories(
-    ${CMAKE_SOURCE_DIR}/../../../../bin
-)
-  else( )
-    message(FATAL_ERROR "Not Found modulecomm")
-endif ()
-
+include(${CMAKE_SOURCE_DIR}/adcpilot.cmake)
 
 
 find_package(autoware_msgs REQUIRED)

+ 1 - 30
src/ros/catkin/src/rtk_hcp2/CMakeLists.txt

@@ -4,36 +4,7 @@ project(rtk_hcp2)
 
 message(STATUS  "Enter rtk_hcp2")
 
-
-SET(QT_PATH  /opt/qt/5.13.2/gcc_64)
-SET(QT2_PATH  /usr/include/x86_64-linux-gnu/qt5)
-SET(AGX_QT_PATH  /usr/include/aarch64-linux-gnu/qt5)
-
-find_path(QT_EXIST   QtCore   ${QT_PATH}/include/QtCore  ${AGX_QT_PATH}/QtCore  ${QT2_PATH}/QtCore)
-
-if(QT_EXIST)
-include_directories(
-  ${QT_PATH}/include
-  ${QT_PATH}/include/QtCore
-  ${QT_PATH}/include/QtSerialPort
-  ${QT_PATH}/include/QtNetwork
-  ${AGX_QT_PATH}
-  ${AGX_QT_PATH}/QtCore
-  ${AGX_QT_PATH}/QtSerialPort
-  ${AGX_QT_PATH}/QtNetwork
-  ${QT2_PATH}
-  ${QT2_PATH}/QtCore
-  ${QT2_PATH}/QtSerialPort
-  ${QT2_PATH}/QtNetwork
-)
-link_directories(
-  ${QT_PATH}/lib
-)
-else()
-  message(FATAL_ERROR "Please set QT_PATH")
-endif()
-
-
+include(${CMAKE_SOURCE_DIR}/findqt.cmake)
 
 
 ## Find catkin macros and libraries

+ 1 - 30
src/ros/catkin/src/rtk_hcp2_baselink/CMakeLists.txt

@@ -4,36 +4,7 @@ project(rtk_hcp2_baselink)
 
 message(STATUS  "Enter rtk_hcp2_baselink")
 
-
-SET(QT_PATH  /opt/qt/5.13.2/gcc_64)
-SET(QT2_PATH  /usr/include/x86_64-linux-gnu/qt5)
-SET(AGX_QT_PATH  /usr/include/aarch64-linux-gnu/qt5)
-
-find_path(QT_EXIST   QtCore   ${QT_PATH}/include/QtCore  ${AGX_QT_PATH}/QtCore  ${QT2_PATH}/QtCore)
-
-if(QT_EXIST)
-include_directories(
-  ${QT_PATH}/include
-  ${QT_PATH}/include/QtCore
-  ${QT_PATH}/include/QtSerialPort
-  ${QT_PATH}/include/QtNetwork
-  ${AGX_QT_PATH}
-  ${AGX_QT_PATH}/QtCore
-  ${AGX_QT_PATH}/QtSerialPort
-  ${AGX_QT_PATH}/QtNetwork
-  ${QT2_PATH}
-  ${QT2_PATH}/QtCore
-  ${QT2_PATH}/QtSerialPort
-  ${QT2_PATH}/QtNetwork
-)
-link_directories(
-  ${QT_PATH}/lib
-)
-else()
-  message(FATAL_ERROR "Please set QT_PATH")
-endif()
-
-
+include(${CMAKE_SOURCE_DIR}/findqt.cmake)
 
 
 ## Find catkin macros and libraries

+ 1 - 27
src/ros/catkin/src/rtk_nav992/CMakeLists.txt

@@ -5,33 +5,7 @@ project(rtk_nav992)
 message(STATUS  "Enter rtk_nav992")
 add_compile_options(-std=c++14)
 
-SET(QT_PATH  /opt/qt/5.13.2/gcc_64)
-SET(QT2_PATH  /usr/include/x86_64-linux-gnu/qt5)
-SET(AGX_QT_PATH  /usr/include/aarch64-linux-gnu/qt5)
-
-find_path(QT_EXIST   QtCore   ${QT_PATH}/include/QtCore  ${AGX_QT_PATH}/QtCore  ${QT2_PATH}/QtCore)
-
-if(QT_EXIST)
-include_directories(
-  ${QT_PATH}/include
-  ${QT_PATH}/include/QtCore
-  ${QT_PATH}/include/QtSerialPort
-  ${QT_PATH}/include/QtNetwork
-  ${AGX_QT_PATH}
-  ${AGX_QT_PATH}/QtCore
-  ${AGX_QT_PATH}/QtSerialPort
-  ${AGX_QT_PATH}/QtNetwork
-  ${QT2_PATH}
-  ${QT2_PATH}/QtCore
-  ${QT2_PATH}/QtSerialPort
-  ${QT2_PATH}/QtNetwork
-)
-link_directories(
-  ${QT_PATH}/lib
-)
-else()
-  message(FATAL_ERROR "Please set QT_PATH")
-endif()
+include(${CMAKE_SOURCE_DIR}/findqt.cmake)
 
 
 

+ 1 - 38
src/ros/catkin/src/testrosmodulecomm/CMakeLists.txt

@@ -4,44 +4,7 @@ project(testrosmodulecomm)
 
 message(STATUS  "Enter testrosmodulecomm")
 
-
-SET(QT_PATH  /usr/include/x86_64-linux-gnu/qt5)
-SET(QT2_PATH  /usr/include/x86_64-linux-gnu/qt5)
-SET(AGX_QT_PATH  /usr/include/aarch64-linux-gnu/qt5)
-
-find_path(QT_EXIST   QtCore   ${QT_PATH}/include/QtCore  ${AGX_QT_PATH}/QtCore  ${QT2_PATH}/QtCore)
-
-if(QT_EXIST)
-include_directories(
-  ${QT_PATH}/include
-  ${QT_PATH}/include/QtCore
-  ${AGX_QT_PATH}
-  ${AGX_QT_PATH}/QtCore
-    ${QT2_PATH}
-    ${QT2_PATH}/QtCore
-)
-link_directories(
-  ${QT_PATH}/lib
-)
-else()
-  message(FATAL_ERROR "Please set QT_PATH")
-endif()
-
-
-find_path(MODULECOMM_INCLUDE_DIR modulecomm.h  ${CMAKE_SOURCE_DIR}/../../../../include )
-find_library(MODULECOMM_LIBRARAY_DIR  modulecomm  ${CMAKE_SOURCE_DIR}/../../../../bin )
-
-if (MODULECOMM_INCLUDE_DIR  AND  MODULECOMM_LIBRARAY_DIR )
-  message(STATUS  "FIND  modulecomm")
-  include_directories(
-    ${CMAKE_SOURCE_DIR}/../../../../include
-  )
-  link_directories(
-    ${CMAKE_SOURCE_DIR}/../../../../bin
-)
-  else( )
-    message(FATAL_ERROR "Not Found modulecomm")
-endif ()
+include(${CMAKE_SOURCE_DIR}/adcpilot.cmake)
 
 
 ## Find catkin macros and libraries

+ 2 - 0
src/tool/rtspview/rtspview.pro

@@ -11,6 +11,8 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = rtspview
 TEMPLATE = app
 
+QMAKE_LFLAGS += -no-pie
+
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which has been marked as deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the