Merge pull request mfreiholz#19 from VSRonin/master

Various fixes to the project files to uniform names and correctly compile static libraries.

Added configuration files for Appveyor and Travis CI, adding the project to those services should work out of the box.

.appveyor.yml

@@ -0,0 +1,160 @@
+version: '2.3.2.{build}'
+branches:
+  only:
+    - master
+
+image: Visual Studio 2015
+clone_depth: 1
+environment:
+  global:
+    # Appveyor doesn't have Qt 12 yet
+    LatestLTSQtVersion: 5.9
+    LatestQtVersion: 5.11
+  matrix:
+    # Latest version of Qt, dll, 64bit, MSVC 2015, qmake
+  - QT5: C:\Qt\%LatestQtVersion%\msvc2015_64
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
+    targetPlatform: amd64
+    use_mingw: "false"
+    use_static: "false"
+    use_cmake: "false"
+# 32 bit builds
+# MSVC 2015 builds
+# Dynamic Library builds
+    # LTS version of Qt, dll, 32bit, MSVC 2015, qmake
+  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
+    targetPlatform: x86
+    use_mingw: "false"
+    use_static: "false"
+    use_cmake: "false"
+    # LTS version of Qt, dll, 32bit, MSVC 2015, cmake
+  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
+    targetPlatform: x86
+    use_mingw: "false"
+    use_static: "false"
+    use_cmake: "true"
+# end Dynamic Library builds
+# Static Library builds
+    # LTS version of Qt, static, 32bit, MSVC 2015, qmake
+  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
+    targetPlatform: x86
+    use_mingw: "false"
+    use_static: "true"
+    use_cmake: "false"
+    # LTS version of Qt, static, 32bit, MSVC 2015, cmake
+  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
+    targetPlatform: x86
+    use_mingw: "false"
+    use_static: "true"
+    use_cmake: "true"
+# end Static Library builds
+# end MSVC 2015 builds
+# MinGW builds
+# Dynamic Library builds
+    # LTS version of Qt, dll, 32bit, MinGW, qmake
+  - QT5: C:\Qt\%LatestLTSQtVersion%\mingw53_32
+    COMPILER: C:\Qt\Tools\mingw530_32
+    targetPlatform: x86
+    use_mingw: "true"
+    use_static: "false"
+    use_cmake: "false"
+    # LTS version of Qt, dll, 32bit, MinGW, cmake
+  - QT5: C:\Qt\%LatestLTSQtVersion%\mingw53_32
+    COMPILER: C:\Qt\Tools\mingw530_32
+    targetPlatform: x86
+    use_mingw: "true"
+    use_static: "false"
+    use_cmake: "true"
+# end Dynamic Library builds
+# Static Library builds
+    # LTS version of Qt, static, 32bit, MinGW, qmake
+  - QT5: C:\Qt\%LatestLTSQtVersion%\mingw53_32
+    COMPILER: C:\Qt\Tools\mingw530_32
+    targetPlatform: x86
+    use_mingw: "true"
+    use_static: "true"
+    use_cmake: "false"
+    # LTS version of Qt, static, 32bit, MinGW, cmake
+  - QT5: C:\Qt\%LatestLTSQtVersion%\mingw53_32
+    COMPILER: C:\Qt\Tools\mingw530_32
+    targetPlatform: x86
+    use_mingw: "true"
+    use_static: "true"
+    use_cmake: "true"
+# end Static Library builds
+# end MinGW builds
+# end 32 bit builds
+# 64 bit builds
+# MSVC 2015 builds
+# Dynamic Library builds
+    # LTS version of Qt, dll, 64bit, MSVC 2015, qmake
+  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015_64
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
+    targetPlatform: amd64
+    use_mingw: "false"
+    use_static: "false"
+    use_cmake: "false"
+    # LTS version of Qt, dll, 64bit, MSVC 2015, cmake
+  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015_64
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
+    targetPlatform: amd64
+    use_mingw: "false"
+    use_static: "false"
+    use_cmake: "true"
+# end Dynamic Library builds
+# Static Library builds
+    # LTS version of Qt, static, 64bit, MSVC 2015, qmake
+  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015_64
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
+    targetPlatform: amd64
+    use_mingw: "false"
+    use_static: "true"
+    use_cmake: "false"
+    # LTS version of Qt, static, 64bit, MSVC 2015, cmake
+  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015_64
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
+    targetPlatform: amd64
+    use_mingw: "false"
+    use_static: "true"
+    use_cmake: "true"
+# end Static Library builds
+# end MSVC 2015 builds
+# end 64 bit builds
+
+matrix:
+  fast_finish: true
+
+before_build:
+- set PATH=%COMPILER%\bin;%QT5%\bin;%PATH%
+- set originalWD=%CD%
+- call "%QT5%\bin\qtenv2.bat"
+- cd %originalWD%
+- if %use_mingw%==false call "%COMPILER%\vcvarsall.bat" %targetPlatform%
+- if %use_static%==true (set USESTATIC=ON) else (set USESTATIC=OFF)
+- if %use_mingw%==true (set CMAKEGENERATOR="MinGW Makefiles") else (set CMAKEGENERATOR="NMake Makefiles")
+- if %use_mingw%==true (set MAKEENGINE=mingw32-make) else (set MAKEENGINE=nmake)
+- if %use_mingw%==true set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
+
+build_script:
+- if %use_cmake%==true mkdir .\build 
+- if %use_cmake%==true cd .\build
+- if %use_cmake%==true cmake --version
+- if %use_cmake%==true cmake -G %CMAKEGENERATOR% -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_EXAMPLES=ON -DCMAKE_DEBUG_POSTFIX=d -DBUILD_STATIC=%USESTATIC% -DCMAKE_INSTALL_PREFIX="./installed" ../
+- if %use_cmake%==true cmake --build .
+- if %use_cmake%==true cmake --build . --target install
+- if %use_cmake%==true cmake -G %CMAKEGENERATOR% -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=%USESTATIC% -DCMAKE_INSTALL_PREFIX="./installed" ../
+- if %use_cmake%==true cmake --build .
+- if %use_cmake%==true cmake --build . --target install
+- if %use_cmake%==false if %use_static%==true qmake "CONFIG+=adsBuildStatic"
+- if %use_cmake%==false if %use_static%==false qmake
+- if %use_cmake%==false %MAKEENGINE% debug
+- if %use_cmake%==false %MAKEENGINE% install
+- if %use_cmake%==false %MAKEENGINE% release
+- if %use_cmake%==false %MAKEENGINE% install
+
+after_build:
+- if %use_mingw%==true set PATH=C:\Program Files\Git\usr\bin;%PATH%

.travis.yml

@@ -0,0 +1,155 @@
+language: cpp
+# gcc is clang on mac
+compiler: gcc
+
+git:
+  depth: 1
+
+matrix:
+  fast_finish: true
+  include:
+  - name: Ubuntu qmake Qt5.5.1
+    os: linux
+    dist: trusty
+    group: stable
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        - sourceline: 'ppa:beineri/opt-qt551-trusty'
+        update: true
+        packages:
+        - qt55base
+        - qt55tools
+        - gcc-6
+        - g++-6
+        - libc6-i386
+    script:
+        - PATH="/opt/qt55/bin:$PATH"
+        - CXX="g++-6"
+        - CC="gcc-6"
+        - qt55-env.sh
+        - qmake
+        - make
+        - make install
+  - name: Ubuntu qmake dll
+    os: linux
+    dist: xenial
+    group: stable
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        - sourceline: 'ppa:beineri/opt-qt-5.12.0-xenial'
+        update: true
+        packages:
+        - qt512base
+        - qt512tools
+        - gcc-6
+        - g++-6
+        - libc6-i386
+        - libgl-dev
+        - libgl1-mesa-dev
+        - mesa-common-dev
+    script:
+        - PATH="/opt/qt512/bin:$PATH"
+        - CXX="g++-6"
+        - CC="gcc-6"
+        - qt512-env.sh
+        - qmake
+        - make
+        - make install
+  - name: Ubuntu qmake static
+    os: linux
+    dist: xenial
+    group: stable
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        - sourceline: 'ppa:beineri/opt-qt-5.12.0-xenial'
+        update: true
+        packages:
+        - qt512base
+        - qt512tools
+        - gcc-6
+        - g++-6
+        - libc6-i386
+        - libgl-dev
+        - libgl1-mesa-dev
+        - mesa-common-dev
+    script:
+        - PATH="/opt/qt512/bin:$PATH"
+        - CXX="g++-6"
+        - CC="gcc-6"
+        - qt512-env.sh
+        - qmake "CONFIG+=adsBuildStatic"
+        - make
+        - make install
+  - name: macOS CMake dll
+    os: osx
+    osx_image: xcode10.1
+    addons:
+      homebrew:
+        packages:
+        - qt
+        update: true
+    script:
+        - PATH="/usr/local/opt/qt5/bin:$PATH"
+        - mkdir -p build
+        - cd build
+        - cmake --version
+        - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_DEBUG_POSTFIX=_debug -DBUILD_EXAMPLES=ON -DBUILD_STATIC=OFF -DCMAKE_INSTALL_PREFIX="./installed" ../
+        - cmake --build .
+        - cmake --build . --target install
+        - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=OFF -DCMAKE_INSTALL_PREFIX="./installed" ../
+        - cmake --build .
+        - cmake --build . --target install
+  - name: macOS CMake static
+    os: osx
+    osx_image: xcode10.1
+    addons:
+      homebrew:
+        packages:
+        - qt
+        update: true
+    script:
+        - PATH="/usr/local/opt/qt5/bin:$PATH"
+        - mkdir -p build
+        - cd build
+        - cmake --version
+        - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_DEBUG_POSTFIX=_debug -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../
+        - cmake --build .
+        - cmake --build . --target install
+        - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../
+        - cmake --build .
+        - cmake --build . --target install
+  - name: macOS qmake dll
+    os: osx
+    osx_image: xcode10.1
+    addons:
+      homebrew:
+        packages:
+        - qt
+        update: true
+    script:
+        - PATH="/usr/local/opt/qt5/bin:$PATH"
+        - qmake
+        - make
+        - make install
+  - name: macOS qmake static
+    os: osx
+    osx_image: xcode10.1
+    addons:
+      homebrew:
+        packages:
+        - qt
+        update: true
+    script:
+        - PATH="/usr/local/opt/qt5/bin:$PATH"
+        - qmake "CONFIG+=adsBuildStatic"
+        - make
+        - make install
+notifications:
+  email: false
+

CMakeLists.txt

@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 3.3)
 set(ads_VERSION "2.3.2")
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 project(QtAdvancedDockingSystem VERSION ${ads_VERSION})
 option(BUILD_STATIC "Build the static library" OFF)
 option(BUILD_EXAMPLES "Build the examples" ON)
-set(REQUIRED_QT_VERSION 5.0.0)
+set(REQUIRED_QT_VERSION 5.5.0)
 find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
 find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
 find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
@@ -56,15 +56,15 @@ set(ads_INSTALL_INCLUDE
     src/FloatingDockContainer.h
 )
 if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
-    set(ads_PlatformDir "x64")
-else()
     set(ads_PlatformDir "x86")
+else()
+    set(ads_PlatformDir "x64")
 endif()
 if(BUILD_STATIC)
-    add_library(ads STATIC ${ads_SRCS})
+    add_library(qtadvanceddocking STATIC ${ads_SRCS})
     set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ADS_STATIC)
 else()
-    add_library(ads SHARED ${ads_SRCS})
+    add_library(qtadvanceddocking SHARED ${ads_SRCS})
     set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ADS_SHARED_EXPORT)
 endif()
 install(FILES ${ads_INSTALL_INCLUDE}
@@ -77,19 +77,19 @@ install(FILES
     DESTINATION license 
     COMPONENT license
 )
-install(TARGETS ads
+install(TARGETS qtadvanceddocking
     EXPORT adsBinary
     RUNTIME DESTINATION bin COMPONENT library
     LIBRARY DESTINATION lib COMPONENT library
     ARCHIVE DESTINATION lib COMPONENT library
 )
-target_include_directories(ads PUBLIC 
+target_include_directories(qtadvanceddocking PUBLIC 
     $<BUILD_INTERFACE:${ads_INCLUDE}>
     $<INSTALL_INTERFACE:include>
     )
-target_link_libraries(ads PUBLIC ${ads_LIBS})
-target_compile_definitions(ads PRIVATE ${ads_COMPILE_DEFINE})
-set_target_properties(ads PROPERTIES 
+target_link_libraries(qtadvanceddocking PUBLIC ${ads_LIBS})
+target_compile_definitions(qtadvanceddocking PRIVATE ${ads_COMPILE_DEFINE})
+set_target_properties(qtadvanceddocking PROPERTIES 
     VERSION ${ads_VERSION}
     EXPORT_NAME "Qt Advanced Docking System"
     ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"