Merge pull request #34 from Supporting/rc-1.2.0

Release 1.2.0

.clang-format

@@ -0,0 +1,3 @@
+BasedOnStyle: Chromium
+
+ColumnLimit: 120

CMakeLists.txt

@@ -1,5 +1,6 @@
 project(pmuc)
 cmake_minimum_required(VERSION 2.8)
+cmake_policy(SET CMP0074 NEW)
 
 SET(CMAKE_MODULE_PATH "${pmuc_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}")
 
@@ -25,7 +26,12 @@ find_package(EIGEN REQUIRED)
 include_directories( ${EIGEN_INCLUDE_DIR} )
 
 # Find Boost dependencies
-find_package(Boost 1.65.1 REQUIRED)
+if (WIN)
+  find_package(Boost 1.69.0 REQUIRED)
+else()
+  find_package(Boost 1.65.1 REQUIRED)
+endif()
+
 IF(Boost_FOUND)
     INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) 
 ENDIF()
@@ -52,13 +58,14 @@ add_test(NAME run_pmuc COMMAND ${PROJECT_NAME} --help)
 set_tests_properties(run_pmuc PROPERTIES PASS_REGULAR_EXPRESSION "usage")
 set_tests_properties(run_pmuc PROPERTIES PASS_REGULAR_EXPRESSION "--x3d")
 set_tests_properties(run_pmuc PROPERTIES PASS_REGULAR_EXPRESSION "--collada")
+set_tests_properties(run_pmuc PROPERTIES PASS_REGULAR_EXPRESSION "--stl")
 
 add_test(NAME pmuc_collada COMMAND ${PROJECT_NAME} --collada ${CMAKE_CURRENT_SOURCE_DIR}/data/plm-sample_11072013.rvm)
 add_test(NAME pmuc_x3d COMMAND ${PROJECT_NAME} --x3d ${CMAKE_CURRENT_SOURCE_DIR}/data/plm-sample_11072013.rvm)
 add_test(NAME pmuc_x3db COMMAND ${PROJECT_NAME} --x3db ${CMAKE_CURRENT_SOURCE_DIR}/data/plm-sample_11072013.rvm)
 add_test(NAME pmuc_ifc COMMAND ${PROJECT_NAME} --ifc ${CMAKE_CURRENT_SOURCE_DIR}/data/plm-sample_11072013.rvm)
 add_test(NAME pmuc_ifc_primitives COMMAND ${PROJECT_NAME} --ifc --primitives ${CMAKE_CURRENT_SOURCE_DIR}/data/plm-sample_11072013.rvm)
-
+add_test(NAME pmuc_stl COMMAND ${PROJECT_NAME} --stl ${CMAKE_CURRENT_SOURCE_DIR}/data/plm-sample_11072013.rvm)
 
 set_tests_properties(pmuc_collada pmuc_x3d pmuc_x3db pmuc_ifc pmuc_ifc_primitives PROPERTIES PASS_REGULAR_EXPRESSION "315 group")
 set_tests_properties(pmuc_collada pmuc_x3d pmuc_x3db pmuc_ifc pmuc_ifc_primitives PROPERTIES PASS_REGULAR_EXPRESSION "118 pyramid")
@@ -71,4 +78,5 @@ set_tests_properties(pmuc_collada pmuc_x3d pmuc_x3db pmuc_ifc pmuc_ifc_primitive
 set_tests_properties(pmuc_collada pmuc_x3d pmuc_x3db pmuc_ifc pmuc_ifc_primitives PROPERTIES PASS_REGULAR_EXPRESSION "  139 cylinder")
 set_tests_properties(pmuc_collada pmuc_x3d pmuc_x3db pmuc_ifc pmuc_ifc_primitives PROPERTIES PASS_REGULAR_EXPRESSION "  0 sphere")
 set_tests_properties(pmuc_collada pmuc_x3d pmuc_x3db pmuc_ifc pmuc_ifc_primitives PROPERTIES PASS_REGULAR_EXPRESSION "  12 line")
-set_tests_properties(pmuc_collada pmuc_x3d pmuc_x3db pmuc_ifc pmuc_ifc_primitives PROPERTIES PASS_REGULAR_EXPRESSION "  80 facet group")
+set_tests_properties(pmuc_collada pmuc_x3d pmuc_x3db pmuc_ifc pmuc_ifc_primitives PROPERTIES PASS_REGULAR_EXPRESSION "  80 facet group")
+set_tests_properties(pmuc_stl PROPERTIES PASS_REGULAR_EXPRESSION "Facets: 189736")

INSTALL

@@ -1,7 +1,7 @@
 Building and installing the Plant Mock-Up Converter
 ===================================================
 
-This project uses the cross-platform CMake build system to generate its build environment, in version 2.8 or newer.
+This project uses the cross-platform CMake build system to generate its build environment, in version 3.1 or newer.
 
 http://www.cmake.org
 

README.md

@@ -1,9 +1,9 @@
 # Plant Mock-Up Converter
 
 [![Build Status](https://api.travis-ci.org/Supporting/pmuc.svg?branch=master)](https://travis-ci.org/Supporting/pmuc)
-[![Build status](https://ci.appveyor.com/api/projects/status/pt0xdf8srhyui2gc/branch/master?svg=true)](https://ci.appveyor.com/project/Supporting/pmuc/branch/master)
+[![Build status](https://ci.appveyor.com/api/projects/status/sbuxou2rv8t2k662/branch/master?svg=true)](https://ci.appveyor.com/project/Supporting/pmuc/branch/master)
 
-Copyright © EDF 2013-2016
+Copyright © EDF 2013-2019
 
 ## About
 
@@ -12,7 +12,8 @@ This project contains a reading library for the RVM file format and a command li
 - [X3D](http://www.web3d.org/x3d/what-x3d) in XML and binary (FI) encoding,
 - [COLLADA](https://www.khronos.org/collada/) files,
 - DSL3D language commands, and
-- [IFC 2x3](http://www.buildingsmart-tech.org/ifc/IFC2x3/TC1/html/).
+- [IFC 2x3](http://www.buildingsmart-tech.org/ifc/IFC2x3/TC1/html/)
+- [STL](<https://en.wikipedia.org/wiki/STL_(file_format)>)
 
 ## License (LGPL)
 
@@ -28,10 +29,10 @@ See the LICENSE.txt file for details.
 
 ### Prerequisites
 
-On Unix and Linux, a g++ compiler >= 4.8 is required.
-On Windows, you need at least Visual Studio 2012. Other platforms / compilers / IDEs have not been tested but are likely to work as well (please file an issue if not).
+PMUC uses the C++ 17 library feature `std::variant`, hence it requires a g++ compiler >= 7, MSVC 19.10 (Visual Studio 2017), or Clang 10.0 is required.
+Other platforms / compilers / IDEs have not been tested but are likely to work as well (please file an issue if not).
 
-Building requires a [cmake](http://www.cmake.org/) version >= 2.8.
+Building requires a [cmake](http://www.cmake.org/) version >= 3.12.
 
 ### Dependencies
 
@@ -40,7 +41,7 @@ Most dependencies are included in git submodules, namely [eigen](http://eigen.tu
     git submodule init
     git submodule update
 
-Soley [boost](http://www.boost.org/) needs to be provided externally. On Linux it is sufficient to install the boost development package, e.g.:
+Soley [boost](http://www.boost.org/) (on windows 1.69 is required, otherwise 1.65.1) needs to be provided externally. On Linux it is sufficient to install the boost development package, e.g.:
 
     sudo apt-get install libboost-all-dev
 

appveyor.yml

@@ -1,7 +1,7 @@
-version: '1.0.{build}'
+version: "1.2.{build}"
 
 image:
-- Visual Studio 2017
+  - Visual Studio 2017
 
 environment:
   BOOST_ROOT: C:\Libraries\boost_1_69_0
@@ -25,4 +25,3 @@ test_script:
 
 artifacts:
   - path: build\bin\$(CMAKE_BUILD_TYPE)
-