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

Commit f4f9aae

Browse files
azdtazdt
committed
Merge branch 'develop'
2 parents c6959cc + 94671d0 commit f4f9aae

37 files changed

+1040
-486
lines changed

‎.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,10 @@
5454
.vs*
5555
x64*
5656

57+
# documentation
58+
doc/
59+
doxygen/
60+
5761
tests/SolARHomographyEstimation/xpcf_custom\.xml
62+
build/
63+
SolARModuleTools.pro.user.4.9-pre1

‎CMakeLists.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.7.2)
22

33
##################################################
4-
set (VERSION_NUMBER "0.5.0")
4+
set (VERSION_NUMBER "0.6.0")
55
project("SolARModuleTools")
66
set (SOURCES
77
src/SolARImage2WorldMapper4Marker2D.cpp
@@ -13,9 +13,10 @@ set (SOURCES
1313
src/SolARBasicMatchesFilter.cpp
1414
src/SolARMapper.cpp
1515
src/SolARMapFilter.cpp
16-
src/ThirdPartyConnector.cpp
1716
src/SolARModuleTools.cpp
1817
src/SolARKeyframeSelector.cpp
18+
src/SolARBasicSink.cpp
19+
src/SolARBasicSource.cpp
1920
)
2021

2122
set (HEADERS
@@ -27,12 +28,12 @@ set (HEADERS
2728
interfaces/SolARKeypointsReIndexer.h
2829
interfaces/SolARMapper.h
2930
interfaces/SolARMapFilter.h
30-
interfaces/ThirdPartyConnector.h
31-
interfaces/SolARModuleManagerTools.h
3231
interfaces/SolARToolsAPI.h
3332
interfaces/SolARModuleTools_traits.h
3433
interfaces/SolARBasicMatchesFilter.h
3534
interfaces/SolARKeyframeSelector.h
35+
interfaces/SolARBasicSink.h
36+
interfaces/SolARBasicSource.h
3637
)
3738

3839
install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/xpcf_SolARModuleTools_registry.xml" DESTINATION $ENV{BCOMDEVROOT}/.xpcf/SolAR/ )

‎SolARModuleTools.pro‎

Lines changed: 93 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,93 @@
1-
## remove Qt dependencies
2-
QT -= core gui
3-
CONFIG -= qt
4-
5-
## global defintions : target lib name, version
6-
TARGET = SolARModuleTools
7-
INSTALLSUBDIR = bcomBuild
8-
FRAMEWORK = $$TARGET
9-
VERSION=0.5.0
10-
11-
DEFINES += MYVERSION=$${VERSION}
12-
DEFINES += TEMPLATE_LIBRARY
13-
CONFIG += Cpp11
14-
CONFIG += c++11
15-
16-
17-
CONFIG(debug,debug|release) {
18-
DEFINES += _DEBUG=1
19-
DEFINES += DEBUG=1
20-
}
21-
22-
CONFIG(release,debug|release) {
23-
DEFINES += _NDEBUG=1
24-
DEFINES += NDEBUG=1
25-
}
26-
27-
PROJECTDEPLOYDIR = $$(BCOMDEVROOT)/$${INSTALLSUBDIR}/$${FRAMEWORK}/$${VERSION}
28-
DEPENDENCIESCONFIG = shared
29-
30-
include ($$(BCOMDEVROOT)/builddefs/qmake/templatelibconfig.pri)
31-
32-
## DEFINES FOR MSVC/INTEL C++ compilers
33-
msvc {
34-
DEFINES += "_BCOM_SHARED=__declspec(dllexport)"
35-
}
36-
37-
INCLUDEPATH += interfaces/
38-
39-
HEADERS += interfaces/SolARImage2WorldMapper4Marker2D.h \
40-
interfaces/SolAR2DTransform.h \
41-
interfaces/SolAR3DTransform.h \
42-
interfaces/SolARHomographyValidation.h \
43-
interfaces/SolARSBPatternReIndexer.h \
44-
interfaces/SolARKeypointsReIndexer.h \
45-
interfaces/SolARMapper.h \
46-
interfaces/SolARMapFilter.h \
47-
interfaces/ThirdPartyConnector.h \
48-
interfaces/SolARModuleManagerTools.h \
49-
interfaces/SolARToolsAPI.h \
50-
interfaces/SolARModuleTools_traits.h \
51-
interfaces/SolARBasicMatchesFilter.h \
52-
interfaces/SolARKeyframeSelector.h
53-
54-
55-
SOURCES += src/SolARImage2WorldMapper4Marker2D.cpp \
56-
src/SolAR2DTransform.cpp \
57-
src/SolAR3DTransform.cpp \
58-
src/SolARHomographyValidation.cpp \
59-
src/SolARSBPatternReIndexer.cpp \
60-
src/SolARKeypointsReIndexer.cpp \
61-
src/SolARBasicMatchesFilter.cpp \
62-
src/SolARMapper.cpp \
63-
src/SolARMapFilter.cpp \
64-
src/ThirdPartyConnector.cpp \
65-
src/SolARModuleTools.cpp \
66-
src/SolARKeyframeSelector.cpp
67-
68-
unix {
69-
}
70-
71-
macx {
72-
DEFINES += _MACOS_TARGET_
73-
QMAKE_MAC_SDK= macosx
74-
QMAKE_CFLAGS += -mmacosx-version-min=10.7 -std=c11 #-x objective-c++
75-
QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -std=c11 -std=c++11 -O3 -fPIC#-x objective-c++
76-
QMAKE_LFLAGS += -mmacosx-version-min=10.7 -v -lstdc++
77-
LIBS += -lstdc++ -lc -lpthread
78-
}
79-
80-
win32 {
81-
82-
DEFINES += WIN64 UNICODE _UNICODE
83-
QMAKE_COMPILER_DEFINES += _WIN64
84-
QMAKE_CXXFLAGS += -wd4250 -wd4251 -wd4244 -wd4275
85-
}
86-
87-
header_files.path = $${PROJECTDEPLOYDIR}/interfaces
88-
header_files.files = $$files($${PWD}/interfaces/*.h*)
89-
90-
xpcf_xml_files.path = $${PROJECTDEPLOYDIR}
91-
xpcf_xml_files.files=$$files($${PWD}/xpcf*.xml)
92-
93-
INSTALLS += header_files
94-
INSTALLS += xpcf_xml_files
1+
## remove Qt dependencies
2+
QT -= core gui
3+
CONFIG -= qt
4+
5+
## global defintions : target lib name, version
6+
TARGET = SolARModuleTools
7+
FRAMEWORK = $$TARGET
8+
VERSION=0.6.0
9+
10+
DEFINES += MYVERSION=$${VERSION}
11+
DEFINES += TEMPLATE_LIBRARY
12+
CONFIG += c++1z
13+
14+
15+
CONFIG(debug,debug|release) {
16+
DEFINES += _DEBUG=1
17+
DEFINES += DEBUG=1
18+
}
19+
20+
CONFIG(release,debug|release) {
21+
DEFINES += _NDEBUG=1
22+
DEFINES += NDEBUG=1
23+
}
24+
25+
DEPENDENCIESCONFIG = shared recurse
26+
27+
include (../builddefs/qmake/templatelibconfig.pri)
28+
29+
## DEFINES FOR MSVC/INTEL C++ compilers
30+
msvc {
31+
DEFINES += "_BCOM_SHARED=__declspec(dllexport)"
32+
}
33+
34+
INCLUDEPATH += interfaces/
35+
36+
HEADERS += interfaces/SolARImage2WorldMapper4Marker2D.h \
37+
interfaces/SolAR2DTransform.h \
38+
interfaces/SolAR3DTransform.h \
39+
interfaces/SolARHomographyValidation.h \
40+
interfaces/SolARSBPatternReIndexer.h \
41+
interfaces/SolARKeypointsReIndexer.h \
42+
interfaces/SolARMapper.h \
43+
interfaces/SolARMapFilter.h \
44+
interfaces/SolARToolsAPI.h \
45+
interfaces/SolARModuleTools_traits.h \
46+
interfaces/SolARBasicMatchesFilter.h \
47+
interfaces/SolARKeyframeSelector.h \
48+
interfaces/SolARBasicSink.h \
49+
interfaces/SolARBasicSource.h
50+
51+
52+
53+
SOURCES += src/SolARImage2WorldMapper4Marker2D.cpp \
54+
src/SolAR2DTransform.cpp \
55+
src/SolAR3DTransform.cpp \
56+
src/SolARHomographyValidation.cpp \
57+
src/SolARSBPatternReIndexer.cpp \
58+
src/SolARKeypointsReIndexer.cpp \
59+
src/SolARBasicMatchesFilter.cpp \
60+
src/SolARMapper.cpp \
61+
src/SolARMapFilter.cpp \
62+
src/SolARModuleTools.cpp \
63+
src/SolARKeyframeSelector.cpp \
64+
src/SolARBasicSink.cpp \
65+
src/SolARBasicSource.cpp
66+
67+
unix {
68+
}
69+
70+
macx {
71+
DEFINES += _MACOS_TARGET_
72+
QMAKE_MAC_SDK= macosx
73+
QMAKE_CFLAGS += -mmacosx-version-min=10.7 -std=c11 #-x objective-c++
74+
QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -std=c11 -std=c++11 -O3 -fPIC#-x objective-c++
75+
QMAKE_LFLAGS += -mmacosx-version-min=10.7 -v -lstdc++
76+
LIBS += -lstdc++ -lc -lpthread
77+
}
78+
79+
win32 {
80+
81+
DEFINES += WIN64 UNICODE _UNICODE
82+
QMAKE_COMPILER_DEFINES += _WIN64
83+
QMAKE_CXXFLAGS += -wd4250 -wd4251 -wd4244 -wd4275
84+
}
85+
86+
header_files.path = $${PROJECTDEPLOYDIR}/interfaces
87+
header_files.files = $$files($${PWD}/interfaces/*.h*)
88+
89+
xpcf_xml_files.path = $${PROJECTDEPLOYDIR}
90+
xpcf_xml_files.files=$$files($${PWD}/xpcf*.xml)
91+
92+
INSTALLS += header_files
93+
INSTALLS += xpcf_xml_files

‎bcom-SolARModuleTools.pc.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ libdir=${exec_prefix}/lib
55
includedir=${prefix}/interfaces
66
Name: SolARModuleTools
77
Description:
8-
Version: 0.5.0
8+
Version: 0.6.0
99
Requires:
1010
Libs: -L${libdir} -l${libname}
1111
Libs.private: ${libdir}/${pfx}${libname}.${lext}

0 commit comments

Comments
 (0)