Merge pull request #5 from Pix4D/port-conan-qt-dependency

Port conan qt dependency

Author: viktor-kopp-pix4d

CHANGELOG.md

@@ -14,6 +14,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 
 
+## QtBasemapPlugin 1.1.0-2
+
+### Changed
+- used conan-package for Qt-dependency
+- minor changes in recipe build configuration
+
+
 ## QtBasemapPlugin 1.1.0-1
 
 ### Added

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.12)
 project(QtBasemapPlugin VERSION 1.0.0 LANGUAGES CXX)
 
 set(LIB_NAME qtgeoservices_basemap_pix4d)
@@ -14,13 +14,7 @@ endif()
 
 find_package(Qt5 COMPONENTS
     Core
-    Gui
-    OpenGL
-    Quick
-    Xml
-    Positioning
-    Location 
-    Network 
+    Location
     REQUIRED QUIET)
 
 set(SOURCES
@@ -29,7 +23,7 @@ set(SOURCES
    src/GeoTileFetcher.cpp
    src/GeoMapReply.cpp
    src/GeoFileTileCache.cpp
-   
+
    src/GeoServiceProviderPlugin.h
    src/GeoTiledMappingManagerEngine.h
    src/GeoTileFetcher.h
@@ -42,20 +36,12 @@ set_target_properties(${LIB_NAME} PROPERTIES AUTORCC ON AUTOMOC ON)
 
 target_link_libraries(${LIB_NAME} PRIVATE
     Qt5::Core
-    Qt5::Gui
-    Qt5::Quick
-    Qt5::Positioning
-    Qt5::Xml
     Qt5::Location
     Qt5::LocationPrivate
-    Qt5::Network
-    Qt5::OpenGL
 )
 
 target_include_directories(${LIB_NAME} INTERFACE
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   PRIVATE src
-   ${Qt5Location_PRIVATE_INCLUDE_DIRS}
 )
 
 target_compile_features(${LIB_NAME} PRIVATE cxx_std_14)

conanfile.py

@@ -4,20 +4,18 @@
 
 class QtBasemapPluginConan(ConanFile):
     name = 'QtBasemapPlugin'
-    version = '1.1.0-1'
+    version = '1.1.0-2'
     license = 'LGPL3'
     url = 'http://code.qt.io/cgit/qt/qtlocation.git/tree/src/plugins/geoservices/mapbox?h=5.10'
     description = 'Qt GeoServices plugin for basemaps including MapBox'
-    options = {'shared': [True, False]}
-    default_options = 'shared=True'
     settings = 'os', 'compiler', 'build_type', 'arch'
     generators = 'cmake'
     exports_sources = ['CMakeLists.txt', 'src/*']
 
     def build(self):
         cmake = CMake(self, parallel=True)
         cmake_args = {
-            '-DBUILD_SHARED_LIBS=': 'ON' if self.options.shared else 'OFF'
+            'BUILD_SHARED_LIBS': True
         }
 
         if(tools.cross_building(self.settings) and
@@ -26,12 +24,20 @@ def build(self):
             # see https://github.com/conan-io/conan/issues/2856#issuecomment-421036768
             cmake.definitions["CONAN_LIBCXX"] = ""
 
-        cmake.configure(source_dir='..', build_dir='build', defs=cmake_args)
+        cmake.configure(source_dir='.', defs=cmake_args)
         cmake.build(target='install')
 
+    def build_requirements(self):
+        self.build_requires('Qt5/[5.12.7-2]@pix4d/stable')
+
     def configure(self):
         del self.settings.compiler.libcxx
 
+    def package_id(self):
+        # Make all options and dependencies (direct and transitive) contribute
+        # to the package id
+        self.info.requires.full_package_mode()
+
     def package_info(self):
         self.cpp_info.libs = ["qtgeoservices_basemap_pix4d"]
         self.cpp_info.includedirs = ['include']

test_package/CMakeLists.txt

@@ -1,40 +1,36 @@
+cmake_minimum_required(VERSION 3.12)
 project(PackageTest CXX)
-cmake_minimum_required(VERSION 3.8)
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_STANDARD_REQUIRED ON)
 
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup()
-
-find_package(QtBasemapPlugin)
-
-add_executable(example example.cpp)
-get_property(_libFileName TARGET qtgeoservices_basemap_pix4d PROPERTY IMPORTED_LOCATION_RELEASE)
+conan_set_find_paths()
 
-if(EXISTS ${_libFileName})
-    message(STATUS "Plugin generated at: ${_libFileName}")
-else()
-    message(FATAL_ERROR "Plugin not generated at: ${_libFileName}")
-endif()
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
-if (${CMAKE_INSTALL_PREFIX} STREQUAL "")
-    set(DEPLOY_TARGET ${CMAKE_BINARY_DIR})
-else()
-    set(DEPLOY_TARGET ${CMAKE_INSTALL_PREFIX})
-endif()
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin)
 
-set(DEPLOY_TARGET ${CMAKE_BINARY_DIR})
-set(MAP_PLUGIN_DESTINATION ${DEPLOY_TARGET}/Plugins/geoservices)
-set(MAP_PLUGIN ${_libFileName})
+find_package(Qt5 COMPONENTS
+    Core
+    Location
+    REQUIRED QUIET)
+find_package(QtBasemapPlugin REQUIRED QUIET)
 
+add_executable(example example.cpp)
+get_property(MAP_PLUGIN TARGET qtgeoservices_basemap_pix4d PROPERTY IMPORTED_LOCATION_RELEASE)
 message(STATUS "Map plugin path ${MAP_PLUGIN}")
 
+set(MAP_PLUGIN_DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/plugins/geoservices)
 file(MAKE_DIRECTORY ${MAP_PLUGIN_DESTINATION})
 file(COPY ${MAP_PLUGIN} DESTINATION ${MAP_PLUGIN_DESTINATION})
 
-
+target_link_libraries(example PRIVATE
+    Qt5::Core
+    Qt5::Location
+)
 # don't link with it because this is needed only by the Qt runtime to give a full path to the folder containing it
 #target_link_libraries(example PRIVATE
 #    qtgeoservices_basemap_pix4d
 #)
-            
+

test_package/conanfile.py

@@ -6,15 +6,13 @@ class QtBasemapPluginTestConan(ConanFile):
     generators = 'cmake'
 
     def build(self):
-        cmake = CMake(self)
-        cmake.configure(source_dir=self.conanfile_directory, build_dir='./')
+        cmake = CMake(self, parallel=True)
+        cmake.configure(build_dir='./')
         cmake.build()
+        # Note: Not running from the install target to avoid packaging qt properly
 
-    def imports(self):
-        self.copy('*.dll', dst='bin', src='x64/vc15/bin')
-        self.copy('*.dylib*', dst='lib', src='lib')
-        self.copy('*.so*', dst='bin', src='lib')
+    def requirements(self):
+        self.requires('Qt5/[5.12.7-2]@pix4d/stable')
 
     def test(self):
-        os.chdir('bin')
-        self.run('.%sexample' % os.sep)
+        self.run(os.path.join('bin', 'example'))

test_package/example.cpp

@@ -1,3 +1,25 @@
-int main() {
-    return 0; 
+#include <QCoreApplication>
+#include <QGeoServiceProvider>
+
+#include <iostream>
+
+int main(int argc, char* argv[])
+{
+    QCoreApplication app(argc, argv);
+    QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath() + "/plugins");
+    if (!QGeoServiceProvider::availableServiceProviders().contains(QStringLiteral("basemap_pix4d"), Qt::CaseInsensitive))
+    {
+        std::cout << "ERROR locating plugin!" << std::endl;
+        return EXIT_FAILURE;
+    }
+
+    QGeoServiceProvider plugin("basemap_pix4d");
+    if (plugin.error())
+    {
+        std::cout << "ERROR loading plugin!" << std::endl;
+        return EXIT_FAILURE;
+    }
+
+    std::cout << "Plugin available" << std::endl;
+    return EXIT_SUCCESS;
 }