Skip to content

Commit

Permalink
Add submodule of TinyXML-2 (#7)
Browse files Browse the repository at this point in the history
* add submodule of tinyxml2 and fix build

* fix bugs in loading xml

* remove tinyxml and update README

* clean up cmake
  • Loading branch information
chongyangma authored Dec 2, 2020
1 parent a4e45bd commit a31a062
Show file tree
Hide file tree
Showing 28 changed files with 140 additions and 8,347 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@
*.app

build
bin
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "3rdparty/clipper"]
path = 3rdparty/clipper
url = https://github.com/skyrpex/clipper.git
[submodule "3rdparty/tinyxml2"]
path = 3rdparty/tinyxml2
url = https://github.com/leethomason/tinyxml2.git
8 changes: 2 additions & 6 deletions 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
# ADD_SUBDIRECTORY(clipper/cpp)
SET(CLIPPER_FOLDER clipper/cpp)
FILE(GLOB CLIPPER_SOURCES ${CLIPPER_FOLDER}/*.cpp)
FILE(GLOB CLIPPER_HEADERS ${CLIPPER_FOLDER}/*.hpp)

ADD_LIBRARY(polyclipping STATIC ${CLIPPER_SOURCES} ${CLIPPER_HEADERS})
ADD_LIBRARY(polyclipping STATIC clipper/cpp/clipper.cpp clipper/cpp/clipper.hpp)
ADD_LIBRARY(tinyxml2 STATIC tinyxml2/tinyxml2.cpp tinyxml2/tinyxml2.h)
1 change: 1 addition & 0 deletions 3rdparty/tinyxml2
Submodule tinyxml2 added at 1aeb57
3 changes: 0 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
PROJECT(LevelSyn)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${CMAKE_SOURCE_DIR}/bin>)

ADD_SUBDIRECTORY(3rdparty)
ADD_SUBDIRECTORY(lib)
ADD_SUBDIRECTORY(src)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ This repository contains the source code and example data of the following publi

The code is cross-platform and has been tested under Windows (MSVC), Linux and Mac OS X. Compiling from scratch requires the installation of [CMake](https://cmake.org/) and [Boost C++ Libraries](http://www.boost.org/). Additional dependencies (already included in this repo) are:
* [Clipper 6.4.2](https://github.com/skyrpex/clipper) for polygon intersection computation
* [tinyxml 2.6.2](http://www.grinninglizard.com/tinyxml/) for xml parsing
* [TinyXML-2](https://github.com/leethomason/tinyxml2) for xml parsing

## Usage

Expand Down
1 change: 0 additions & 1 deletion lib/CMakeLists.txt

This file was deleted.

29 changes: 0 additions & 29 deletions lib/tinyxml/CMakeLists.txt

This file was deleted.

130 changes: 0 additions & 130 deletions lib/tinyxml/Makefile

This file was deleted.

Loading

0 comments on commit a31a062

Please sign in to comment.