Skip to content
This repository was archived by the owner on Jul 20, 2023. It is now read-only.

Move to version 0.5.2 #5

Merged
merged 1 commit into from
Apr 9, 2019
Merged

Move to version 0.5.2 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.7.2)

##################################################
set (VERSION_NUMBER "0.5.1")
set (VERSION_NUMBER "0.5.2")
project("SolARModuleFBOW")
set (SOURCES
src/SolARModuleFBOW.cpp
Expand Down
2 changes: 1 addition & 1 deletion SolARModuleFBOW.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CONFIG -= qt
TARGET = SolARModuleFBOW
INSTALLSUBDIR = bcomBuild
FRAMEWORK = $$TARGET
VERSION=0.5.1
VERSION=0.5.2

DEFINES += MYVERSION=$${VERSION}
DEFINES += TEMPLATE_LIBRARY
Expand Down
2 changes: 1 addition & 1 deletion bcom-SolARModuleFBOW.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ libdir=${exec_prefix}/lib
includedir=${prefix}/interfaces
Name: SolARModuleFBOW
Description:
Version: 0.5.0
Version: 0.5.2
Requires:
Libs: -L${libdir} -l${libname}
Libs.private: ${libdir}/${pfx}${libname}.${lext}
Expand Down
2 changes: 1 addition & 1 deletion packagedependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opencv|3.4.3|opencv|thirdParties|url_repo_artifactory
fbow|0.0.1|fbow|thirdParties|http://repository.b-com.com/amc-generic
SolARFramework|0.5.1|SolARFramework|bcomBuild|url_repo_artifactory
SolARFramework|0.5.2|SolARFramework|bcomBuild|url_repo_artifactory
xpcf|2.1.0|xpcf|thirdParties|http://repository.b-com.com/amc-generic
boost|1.68.0|boost|thirdParties|http://repository.b-com.com/amc-generic
spdlog|0.14.0|spdlog|thirdParties|http://repository.b-com.com/amc-generic
Expand Down
2 changes: 1 addition & 1 deletion tests/ClosestKeyframeRetrieval/SolARTestModuleFBOWClosestKeyframeRetrieval.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TARGET = SolARTestModuleFBOWClosestKeyframeRetrieval
VERSION=0.5.1
VERSION=0.5.2

CONFIG += c++11
CONFIG -= qt
Expand Down
4 changes: 2 additions & 2 deletions tests/ClosestKeyframeRetrieval/conf_ClosestKeyframeRetrieval.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<xpcf-registry>

<module uuid="15e1990b-86b2-445c-8194-0cbe80ede970" name="SolARModuleOpenCV" description="SolARModuleOpenCV" path="$BCOMDEVROOT/bcomBuild/SolARModuleOpenCV/0.5.1/lib/x86_64/shared">
<module uuid="15e1990b-86b2-445c-8194-0cbe80ede970" name="SolARModuleOpenCV" description="SolARModuleOpenCV" path="$BCOMDEVROOT/bcomBuild/SolARModuleOpenCV/0.5.2/lib/x86_64/shared">
<component uuid="e42d6526-9eb1-4f8a-bb68-53e06f09609c" name="SolARImageLoaderOpencv" description="SolARImageLoaderOpencv">
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect"/>
<interface uuid="6FCDAA8D-6EA9-4C3F-97B0-46CD11B67A9B" name="IImageLoader" description="IImageLoader"/>
Expand All @@ -16,7 +16,7 @@
</component>
</module>

<module uuid="b81f0b90-bdbc-11e8-a355-529269fb1459" name="SolARModuleFBOW" description="SolARModuleFBOW" path="$BCOMDEVROOT/bcomBuild/SolARModuleFBOW/0.5.1/lib/x86_64/shared">
<module uuid="b81f0b90-bdbc-11e8-a355-529269fb1459" name="SolARModuleFBOW" description="SolARModuleFBOW" path="$BCOMDEVROOT/bcomBuild/SolARModuleFBOW/0.5.2/lib/x86_64/shared">
<component uuid="9d1b1afa-bdbc-11e8-a355-529269fb1459" name="SolARKeyframeRetrieverFBOW" description="SolARKeyframeRetrieverFBOW">
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect"/>
<interface uuid="f60980ce-bdbd-11e8-a355-529269fb1459" name="IKeyframeRetriever" description="IKeyframeRetriever"/>
Expand Down
6 changes: 3 additions & 3 deletions tests/ClosestKeyframeRetrieval/packagedependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SolARFramework|0.5.1|SolARFramework|bcomBuild|url_repo_artifactory
SolARModuleOpenCV|0.5.1|SolARModuleOpenCV|bcomBuild|url_repo_artifactory
SolARModuleFBOW|0.5.1|SolARModuleFBOW|bcomBuild|url_repo_artifactory
SolARFramework|0.5.2|SolARFramework|bcomBuild|url_repo_artifactory
SolARModuleOpenCV|0.5.2|SolARModuleOpenCV|bcomBuild|url_repo_artifactory
SolARModuleFBOW|0.5.2|SolARModuleFBOW|bcomBuild|url_repo_artifactory
xpcf|2.1.0|xpcf|thirdParties|http://repository.b-com.com/
boost|1.68.0|boost|thirdParties|http://repository.b-com.com/
opencv|3.4.3|opencv|thirdParties|http://repository.b-com.com/
Expand Down
2 changes: 1 addition & 1 deletion xpcf_SolARModuleFBOW_registry.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<xpcf-registry>
<module uuid="b81f0b90-bdbc-11e8-a355-529269fb1459" name="SolARModuleFBOW" description="SolARModuleFBOW" path="$BCOMDEVROOT/bcomBuild/SolARModuleFBOW/0.5.0/lib/x86_64/shared">
<module uuid="b81f0b90-bdbc-11e8-a355-529269fb1459" name="SolARModuleFBOW" description="SolARModuleFBOW" path="$BCOMDEVROOT/bcomBuild/SolARModuleFBOW/0.5.2/lib/x86_64/shared">
<component uuid="9d1b1afa-bdbc-11e8-a355-529269fb1459" name="SolARKeyframeRetrieverFBOW" description="SolARKeyframeRetrieverFBOW">
<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect"/>
<interface uuid="f60980ce-bdbd-11e8-a355-529269fb1459" name="IKeyframeRetriever" description="IKeyframeRetriever"/>
Expand Down