Merge pull request #26 from KurtPattyn/develop

Release v1.0.2

Author: frederikvannoote

.travis.yml

@@ -1,37 +1,39 @@
 language: c++
 sudo: required
+dist: trusty
+
+os:
+  - linux
+  - osx
+
+compiler:
+  - gcc
+  - clang
+ 
+env: 
+  global:
+    - CTEST_OUTPUT_ON_FAILURE=True # Print output of failed unit test.
+
+  matrix:
+    - BUILD_TYPE=Debug
+      SHARED_LIBS=ON
+    - BUILD_TYPE=Release
+      SHARED_LIBS=ON
+    - BUILD_TYPE=Debug
+      SHARED_LIBS=OFF
+    - BUILD_TYPE=Release
+      SHARED_LIBS=OFF
 
 matrix:
-  include:
-    - os: osx
+  exclude:
+    - os: linux
       compiler: clang
-      env: SHARED_LIBS=ON
     - os: osx
-      compiler: clang
-      env: SHARED_LIBS=OFF
-    - os: linux
-      dist: trusty
-      compiler: gcc
-      env: SHARED_LIBS=ON
-    - os: linux
-      dist: trusty
       compiler: gcc
-      env: SHARED_LIBS=OFF
 
 install:
   - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
   - mkdir -p ${DEPS_DIR} && cd ${DEPS_DIR}
-  ############################################################################
-  # Install a recent CMake (unless already installed on OS X)
-  ############################################################################
-  - |
-    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
-      CMAKE_URL="http://www.cmake.org/files/v3.5/cmake-3.5.2-Linux-x86_64.tar.gz"
-      mkdir cmake && travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
-      export PATH=${DEPS_DIR}/cmake/bin:${PATH}
-    else
-      if ! brew ls --version cmake &>/dev/null; then brew install cmake; fi
-    fi
 
   ############################################################################
   # Install Qt5.9
@@ -49,7 +51,7 @@ install:
       brew update > /dev/null
       brew tap homebrew/versions
       brew install qt
-      
+
       export QTDIR="/usr/local/opt/qt5"
       export PATH="$QTDIR/bin:$PATH"
     fi
@@ -62,16 +64,17 @@ install:
     cd QtMqtt
     mkdir build
     cd build
-    cmake -DCMAKE_BUILD_TYPE=debug -DBUILD_SHARED_LIBS=OFF -DPRIVATE_TESTS_ENABLED=ON -DCMAKE_INSTALL_PREFIX=/tmp/installed ..
+    cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_SHARED_LIBS=${SHARED_LIBS} -DPRIVATE_TESTS_ENABLED=OFF -DCMAKE_INSTALL_PREFIX=/tmp/installed ..
     cmake --build . --target all
     cmake --build . --target install
     
 before_script:
   - cd ${TRAVIS_BUILD_DIR}
   - mkdir build
   - cd build
-  - cmake -DCMAKE_BUILD_TYPE=debug -DBUILD_SHARED_LIBS=${SHARED_LIBS} -DQt5Mqtt_DIR=/tmp/installed/lib/cmake/Qt5Mqtt -DPRIVATE_TESTS_ENABLED=ON ..
+  - cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_SHARED_LIBS=${SHARED_LIBS} -DQt5Mqtt_DIR=/tmp/installed/lib/cmake/Qt5Mqtt -DPRIVATE_TESTS_ENABLED=ON ..
 
 script:
   - cmake --build . --target all
   - cmake --build . --target test
+

CMakeLists.txt

@@ -49,6 +49,10 @@ set(INCLUDE_INSTALL_DIR include/${INSTALL_DIRECTORY_NAME})
 set(BIN_INSTALL_DIR bin)
 set(CMAKE_INSTALL_DIR lib/cmake/${CMAKE_DIRECTORY_NAME})
 
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
 project(${PROJECT_NAME})
 
 #================================

src/CMakeLists.txt

@@ -24,6 +24,7 @@ add_library(${TARGET_NAME}
             ${${TARGET_NAME}_SOURCES}
             ${${TARGET_NAME}_PUBLIC_HEADERS}
             ${${TARGET_NAME}_PRIVATE_HEADERS})
+add_library(${PROJECT_NAME_PREFIX}${QT_MAJOR_VERSION_REQUIRED}::${TARGET_NAME} ALIAS ${TARGET_NAME})
 
 # add the Qtlibraries to the list of linked libraries
 # the Qt libraries are added as PUBLIC, so that projects using this module will transitively
@@ -42,7 +43,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES
 ##############################################
 
 # Add include directories of own project to include interface
-target_include_directories(${TARGET_NAME} INTERFACE ${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR})
+target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
 
 # Create config file
 configure_package_config_file(cmake/config.cmake.in