Merge branch 'develop'

Author: azdt

.gitignore

@@ -55,9 +55,14 @@
 .vs*
 x64*
 
+# documentation
+doc/
+doxygen/
+
 *.log
 *.tlog
 *.TMP
 *.tmp
 
 
+build/

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.7.2)
 
 ##################################################
-set (VERSION_NUMBER "0.5.0")
+set (VERSION_NUMBER "0.6.0")
 project("SolARModuleFBOW")
 set (SOURCES 
 	src/SolARModuleFBOW.cpp
@@ -14,14 +14,6 @@ set (HEADERS
     interfaces/SolARKeyframeRetrieverFBOW.h
 )
 
-find_package(OpenGL REQUIRED)
-
-
-
-include_directories(
-	src/
-)
-
 install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/xpcf_SolARModuleFBOW_registry.xml" DESTINATION $ENV{BCOMDEVROOT}/.xpcf/SolAR/	)
 
 ##################################################

SolARModuleFBOW.pro

@@ -4,14 +4,13 @@ CONFIG -= qt
 
 ## global defintions : target lib name, version
 TARGET = SolARModuleFBOW
-INSTALLSUBDIR = bcomBuild
+
 FRAMEWORK = $$TARGET
-VERSION=0.5.0
+VERSION=0.6.0
 
 DEFINES += MYVERSION=$${VERSION}
 DEFINES += TEMPLATE_LIBRARY
-CONFIG += Cpp11
-CONFIG += c++11
+CONFIG += c++1z
 
 
 CONFIG(debug,debug|release) {
@@ -25,10 +24,9 @@ CONFIG(release,debug|release) {
 }
 
 
-PROJECTDEPLOYDIR = $$(BCOMDEVROOT)/$${INSTALLSUBDIR}/$${FRAMEWORK}/$${VERSION}
-DEPENDENCIESCONFIG = shared
+DEPENDENCIESCONFIG = shared recurse
 
-include ($$(BCOMDEVROOT)/builddefs/qmake/templatelibconfig.pri)
+include (../builddefs/qmake/templatelibconfig.pri)
 
 ## DEFINES FOR MSVC/INTEL C++ compilers
 msvc {
@@ -67,7 +65,7 @@ win32 {
 header_files.path = $${PROJECTDEPLOYDIR}/interfaces
 header_files.files = $$files($${PWD}/interfaces/*.h*)
 
-xpcf_xml_files.path = $$(BCOMDEVROOT)/.xpcf/SolAR
+xpcf_xml_files.path = $$(HOME)/.xpcf/SolAR
 xpcf_xml_files.files=$$files($${PWD}/xpcf*.xml)
 
 INSTALLS += header_files

bcom-SolARModuleFBOW.pc.in

@@ -5,7 +5,7 @@ libdir=${exec_prefix}/lib
 includedir=${prefix}/interfaces
 Name: SolARModuleFBOW
 Description:
-Version: 0.5.0
+Version: 0.6.0
 Requires:
 Libs: -L${libdir} -l${libname}
 Libs.private: ${libdir}/${pfx}${libname}.${lext}