ソースを参照

change deploylib.sh

yuchuli 3 年 前
コミット
3c9b8fa852
3 ファイル変更22 行追加4 行削除
  1. 19 1
      deploylib.sh
  2. 1 2
      src1/common/modulecomm/main.cpp
  3. 2 1
      src1/common/modulecomm/modulecomm.pro

+ 19 - 1
deploylib.sh

@@ -31,7 +31,25 @@ fi
 QtPlatformdir=$Qtgccdir/plugins/platforms
 QtLibDir=$Qtgccdir/lib
 
-export LD_LIBRARY_PATH=./thirdpartylib/FastRTPS/lib/libarm64:$LD_LIBRARY_PATH
+RTPSLIBDIR=`pwd`/thirdpartylib/FastRTPS/lib/libamd64
+RTPSLIBARMDIR=`pwd`/thirdpartylib/FastRTPS/lib/libarm64
+
+echo $RTPSLIBDIR
+
+new_export="export LD_LIBRARY_PATH=$RTPSLIBDIR:\$LD_LIBRARY_PATH"
+new_export2="export LD_LIBRARY_PATH=$RTPSLIBARMDIR:\$LD_LIBRARY_PATH"
+
+reg_str="^\s*export\s*LD_LIBRARY_PATH=$RTPSLIBDIR:\$LD_LIBRARY_PATH"
+
+if grep -q $reg_str  ~/.bashrc
+then
+echo $RTPSLIBDIR exists in LD_LIBRARAY_PATH
+else
+	echo define LD_LIBRARY_PATH
+	echo $new_export >> ~/.bashrc
+	echo $new_export2 >> ~/.bashrc
+	echo Please source .bashrc
+fi
 
 if [ "$#" -lt 1 ]; then
 	echo "没有输入"

+ 1 - 2
src1/common/modulecomm/main.cpp

@@ -160,8 +160,7 @@ int main(int argc, char *argv[])
 
       std::thread * xthreadproto = new std::thread(threadsendproto);
 
-      std::string  a1;
-      int b1 = a1;
+
 
 //    extfunc<int>::pfun x = &testfunc;
 //    extfunc<double>::pfun x2 = &testfunc2;

+ 2 - 1
src1/common/modulecomm/modulecomm.pro

@@ -1,11 +1,12 @@
 QT -= gui
 
 QT += dbus
+QT += xml
 
 TEMPLATE = lib
 DEFINES += MODULECOMM_LIBRARY
 
-DEFINES += USE_FASTRTPS
+#unix:DEFINES += USE_FASTRTPS
 DEFINES += USEDBUS
 
 CONFIG += c++11