diff --git a/.gitmodules b/.gitmodules index 55515a4..21905a9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,4 @@ url = https://github.com/KhronosGroup/OpenCOLLADA.git [submodule "external/eigen"] path = external/eigen - url = https://github.com/eigenteam/eigen-git-mirror -[submodule "external/ifcplusplus"] - path = external/ifcplusplus - url = https://github.com/Supporting/ifcplusplus + url = https://github.com/eigenteam/eigen-git-mirror \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ec6eb1..6c67318 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,11 +19,6 @@ include_directories( external/OpenCOLLADA/COLLADABaseUtils/include ) # Add XIOT dependencies add_subdirectory( external/xiot ) -# Add IfcPlusPlus dependencies -# set(BUILD_VIEWER_APPLICATION OFF) -# add_subdirectory( external/ifcplusplus/IfcPlusPlus ) -# include_directories( external/ifcplusplus/IfcPlusPlus/src ) - # Add Eigen dependencies (headers only) set(EIGEN_INCLUDE_DIR external/eigen) find_package(EIGEN REQUIRED) @@ -48,7 +43,6 @@ enable_testing() add_executable(${PROJECT_NAME} ${SRC_LIST} ${APISRC_LIST} ${COMMONSRC_LIST} ${CONVERTERSSRC_LIST}) target_include_directories(${PROJECT_NAME} PUBLIC external/xiot/include ) target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_BINARY_DIR}/external/xiot/src ) -# target_link_libraries(${PROJECT_NAME} IfcPlusPlus) target_link_libraries(${PROJECT_NAME} ${OPENGL_LIBRARIES} OpenCOLLADAStreamWriter_static xiot) set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 17) set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD_REQUIRED ON) diff --git a/README.md b/README.md index 332dd43..9b53e10 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,27 @@ -Plant Mock-Up Converter -======================= +# 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) - Copyright © EDF 2013-2016 -About ------ +## About + +This project contains a reading library for the RVM file format and a command line utility that allows to convert RVM files to -This project contains a reading library for the RVM file format and a command line utility that allows to convert RVM files to - [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/). -License (LGPL) -------- +## License (LGPL) + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. -This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - See the LICENSE.txt file for details. ## How to Build @@ -32,11 +31,11 @@ See the LICENSE.txt file for details. 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). -Building requires a [cmake](http://www.cmake.org/) version >= 2.8. +Building requires a [cmake](http://www.cmake.org/) version >= 2.8. ### Dependencies -Most dependencies are included in git submodules, namely [eigen](http://eigen.tuxfamily.org), [OpenCOLLADA](https://collada.org/mediawiki/index.php/OpenCOLLADA), [xiot](https://github.com/Supporting/xiot), and [IFCPlusPlus](https://github.com/ifcquery/ifcplusplus). To inititalize the submodules, run: +Most dependencies are included in git submodules, namely [eigen](http://eigen.tuxfamily.org), [OpenCOLLADA](https://collada.org/mediawiki/index.php/OpenCOLLADA), and [xiot](https://github.com/Supporting/xiot). To inititalize the submodules, run: git submodule init git submodule update @@ -51,8 +50,8 @@ On other systems, let the environment varaible ``BOOST_ROOT```point to Boost roo #### Windows -Run cmake from a different directory than your source (e.g. in a ```build``` folder) and select the generator of your choice, e.g.: - +Run cmake from a different directory than your source (e.g. in a `build` folder) and select the generator of your choice, e.g.: + cmake -G "Visual Studio 14 2015 Win64" .. Open the generated IDE file (pmuc.sln) or start the build from command line: @@ -62,23 +61,19 @@ Open the generated IDE file (pmuc.sln) or start the build from command line: #### Linux Run: - + mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release cmake --build . --target pmuc ### Running Tests -PMUC includes a number of running tests that can be run from the build directory using ```ctest```: +PMUC includes a number of running tests that can be run from the build directory using `ctest`: ctest -C Release --output-on-failure -Credit ------- +## Credit + This work has been led and founded by EDF DIN. It has been based on an analysis made by Kristian Sons from Supporting GmbH. See the AUTHORS.txt file for details. - - - - diff --git a/external/ifcplusplus b/external/ifcplusplus deleted file mode 160000 index 17367f7..0000000 --- a/external/ifcplusplus +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 17367f72e189b90796dc1c18d6d0f85928208d2d diff --git a/src/converters/ifcconverter.cpp b/src/converters/ifcconverter.cpp index 5481b04..4ac0f58 100644 --- a/src/converters/ifcconverter.cpp +++ b/src/converters/ifcconverter.cpp @@ -96,7 +96,7 @@ IFCConverter::IFCConverter(const std::string& filename, const std::string& schem FileName name; name.name = boost::replace_all_copy(filename, "\\", "\\\\"); name.time_stamp_text = ts; - name.preprocessor_version = "IfcPlusPlus"; + name.preprocessor_version = "PMUC"; m_writer->addHeader(desc, name); }