Update pkgname

.gitignore

@@ -17,6 +17,7 @@ _output/
 /plugins/
 
 /3rdparty/opencv/
+/pkginfo.sh
 /*.nsi
 /*.exe
 

CMakeLists.txt

@@ -83,6 +83,10 @@ configure_file(
   include/mynteye/mynteye.h @ONLY
 )
 
+configure_file(
+  cmake/templates/pkginfo.sh.in
+  ${CMAKE_CURRENT_SOURCE_DIR}/pkginfo.sh @ONLY
+)
 if(OS_WIN)
   configure_file(
     scripts/win/nsis/winpack.nsi.in

cmake/templates/pkginfo.sh.in

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+OpenCV_VERSION=@OpenCV_VERSION@
+OpenCV_VERSION_MAJOR=@OpenCV_VERSION_MAJOR@
+OpenCV_VERSION_MINOR=@OpenCV_VERSION_MINOR@
+OpenCV_VERSION_PATCH=@OpenCV_VERSION_PATCH@
+OpenCV_VERSION_STATUS=@OpenCV_VERSION_STATUS@
+
+_contains() {
+  [ `echo $1 | grep -c "$2"` -gt 0 ]
+}
+
+if _contains "@OpenCV_INCLUDE_DIRS@" "/ros/"; then
+  ROS_VERSION=$(rosversion -d)
+  OpenCV_VERSION=ros-$ROS_VERSION
+fi

scripts/win/nsis/winpack.nsi.in

@@ -61,7 +61,7 @@ Section "SDK (required)"
   SetOutPath $INSTDIR
 
   ; Put file there
-  File /r "mynteye-s-${VERSION}-win-x64\*"
+  File /r "mynteye-s-${VERSION}-win-x64-opencv-${OpenCV_VERSION}\*"
 
   ; Write the installation path into the registry
   WriteRegStr HKLM "SOFTWARE\MYNTEYESSDK" "Install_Dir" "$INSTDIR"

scripts/win/winpack.sh

@@ -75,7 +75,8 @@ mv "$ROOT_DIR/3rdparty/opencv" "$ROOT_DIR/_install/3rdparty/opencv"
 ################################################################################
 # archive exe
 
-_pkgname=$1
+source "$ROOT_DIR/pkginfo.sh"
+_pkgname=$1-opencv-$OpenCV_VERSION
 mv "$ROOT_DIR/_install" "$ROOT_DIR/$_pkgname"
 
 makensis "$ROOT_DIR/winpack.nsi"