Skip to content

Commit

Permalink
Release v0.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
arobenko committed Jun 3, 2017
2 parents bf6dd01 + 610f1b4 commit 01619bb
Show file tree
Hide file tree
Showing 31 changed files with 2,514 additions and 756 deletions.
36 changes: 36 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
image: Visual Studio 2015

init:
- git config --global core.autocrlf input

clone_folder: c:\projects\cc_ublox
shallow_clone: true

matrix:
fast_finish: false

platform:
- x64
- x86

configuration:
- Debug
- Release

environment:
matrix:
- TOOLCHAIN: msvc14

install:
- call script\appveyor_install.bat
- set PATH=%PATH%;%QTDIR%\bin

build_script:
- mkdir build.%PLATFORM%.%CONFIGURATION%
- cd build.%PLATFORM%.%CONFIGURATION%
- cmake .. -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "NMake Makefiles" -DCC_UBLOX_QT_DIR=%QTDIR% -DCC_UBLOX_FULL_SOLUTION=ON -DCC_UBLOX_PLUGIN_ALL=OFF -DCC_UBLOX_PLUGIN_UBLOX8=%UBLOX8_OPT% -DCC_UBLOX_PLUGIN_UBLOX7=ON -DCC_UBLOX_PLUGIN_UBLOX6=ON -DCC_UBLOX_PLUGIN_UBLOX5=ON
- nmake install

test_script:
- ctest

20 changes: 20 additions & 0 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,26 @@ errors. Enable this option in case the compiler generates warning and fails the
compilation. Please open the issue when such scenario occurs. Default value is
**OFF**.

- **CC_UBLOX_PLUGIN_ALL**=ON/OFF - Build single UBlox protocol plugin for
[CommsChampion Tools](https://github.com/arobenko/comms_champion#commschampion-tools),
that contains all the known UBX protocol messages. Default value is **ON**. Building
single plugin requires a lot of RAM (at least 8GB). If the compiler fails with
error saying that it is out of heap, set this option to **OFF** and enable
device specific ones described below.

- **CC_UBLOX_PLUGIN_UBLOX8**=ON/OFF - Build protocol plugin dedicated to ublox-8
only devices. Default value is **OFF**.

- **CC_UBLOX_PLUGIN_UBLOX7**=ON/OFF - Build protocol plugin dedicated to ublox-7
only devices. Default value is **OFF**.

- **CC_UBLOX_PLUGIN_UBLOX6**=ON/OFF - Build protocol plugin dedicated to ublox-6
only devices. Default value is **OFF**.

- **CC_UBLOX_PLUGIN_UBLOX5**=ON/OFF - Build protocol plugin dedicated to ublox-5
only devices. Default value is **OFF**.


## Choosing C++ Standard

Since CMake v3.1 it became possible to set version of C++ standard by setting
Expand Down
25 changes: 22 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ option (CC_UBLOX_LIB_ONLY "Install only UBLOX protocol library, no other applica
option (CC_UBLOX_AND_COMMS_LIBS_ONLY "Install UBLOX protocol and COMMS libraries only, no other applications/plugings are built." OFF)
option (CC_UBLOX_FULL_SOLUTION "Build and install full solution, including CommsChampion sources." OFF)
option (CC_UBLOX_NO_WARN_AS_ERR "Do NOT treat warning as error" OFF)
option (CC_UBLOX_PLUGIN_ALL "Build plugin for all the possible messages for any ublox device." ON)
option (CC_UBLOX_PLUGIN_UBLOX8 "Build plugin for the messages supported by ublox-8." OFF)
option (CC_UBLOX_PLUGIN_UBLOX7 "Build plugin for the messages supported by ublox-7." OFF)
option (CC_UBLOX_PLUGIN_UBLOX6 "Build plugin for the messages supported by ublox-6." OFF)
option (CC_UBLOX_PLUGIN_UBLOX5 "Build plugin for the messages supported by ublox-5." OFF)

if (NOT CMAKE_CXX_STANDARD)
set (CMAKE_CXX_STANDARD 11)
Expand Down Expand Up @@ -63,7 +68,7 @@ set (CC_EXTERNAL_TGT "comms_champion_external")
macro (externals install_dir build_cc)
include(ExternalProject)

set (cc_tag "v0.17")
set (cc_tag "v0.18.1")
set (cc_main_dir "${CMAKE_BINARY_DIR}/comms_champion")
set (cc_src_dir "${cc_main_dir}/src")
set (cc_bin_dir "${cc_main_dir}/build")
Expand Down Expand Up @@ -145,10 +150,23 @@ while (TRUE)
file (RELATIVE_PATH rel_plugin_install_path "${CC_ROOT_DIR}" "${CC_PLUGIN_DIR}")
set (PLUGIN_INSTALL_DIR "${INSTALL_DIR}/${rel_plugin_install_path}")
endif ()


if (EXISTS "${INSTALL_DIR}/cmake/CommsChampionConfig.cmake")
FILE(GLOB_RECURSE comms.headers "${INSTALL_DIR}/include/comms/*.h")
add_custom_target(comms.headers SOURCES ${comms.headers})
FILE(GLOB_RECURSE cc.headers "${INSTALL_DIR}/include/comms_champion/*.h")
add_custom_target(cc.headers SOURCES ${cc.headers})
endif ()

break()
endwhile()

if (NOT "${CC_UBLOX_QT_DIR}" STREQUAL "")
list (APPEND CMAKE_PREFIX_PATH ${CC_UBLOX_QT_DIR})
endif ()

find_package(Qt5Core)

if ((CMAKE_COMPILER_IS_GNUCC) OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
set (extra_flags_list
"-Wall" "-Wextra" "-Wcast-align" "-Wcast-qual" "-Wctor-dtor-privacy"
Expand All @@ -164,7 +182,7 @@ if ((CMAKE_COMPILER_IS_GNUCC) OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
endif ()

if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
list (APPEND extra_flags_list "-Wno-dangling-field" "-ftemplate-depth=1024")
list (APPEND extra_flags_list "-Wno-dangling-field" "-Wno-unused-command-line-argument" "-ftemplate-depth=1024")
endif ()

if (NOT CC_UBLOX_NO_WARN_AS_ERR)
Expand Down Expand Up @@ -196,3 +214,4 @@ include_directories(
)

add_subdirectory(cc_plugin)
add_subdirectory(example)
Loading

0 comments on commit 01619bb

Please sign in to comment.