Skip to content

Commit fa519c3

Browse files
author
Roberto Di Remigio
committed
Merge branch 'master' into moniWEM
2 parents 2a7e901 + 7902065 commit fa519c3

File tree

15 files changed

+4534
-116
lines changed

15 files changed

+4534
-116
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
*~
22
*#
33
*.out
4-
external/libtaylor
54
external/libgetkw
65
output*
76
release*

CMakeLists.txt

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -221,29 +221,16 @@ set(TaylorCMakeArgs
221221
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
222222
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
223223
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
224-
-Wno-dev)
224+
)
225225

226-
if(DEVELOPMENT_CODE)
227-
ExternalProject_Add(libtaylor
228-
SVN_REPOSITORY http://libtaylor.googlecode.com/svn/trunk/
229-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}
230-
PREFIX ${PROJECT_SOURCE_DIR}/external
231-
SOURCE_DIR ${PROJECT_SOURCE_DIR}/external/libtaylor
232-
BINARY_DIR ${PROJECT_BINARY_DIR}/external/libtaylor-build
233-
STAMP_DIR ${PROJECT_BINARY_DIR}/external/libtaylor-stamp
234-
TMP_DIR ${PROJECT_BINARY_DIR}/external/libtaylor-tmp
235-
INSTALL_DIR ${PROJECT_BINARY_DIR}/external
236-
CMAKE_ARGS ${TaylorCMakeArgs})
237-
else()
238-
ExternalProject_Add(libtaylor
239-
PREFIX ${PROJECT_SOURCE_DIR}/external
240-
SOURCE_DIR ${PROJECT_SOURCE_DIR}/external/libtaylor
241-
BINARY_DIR ${PROJECT_BINARY_DIR}/external/libtaylor-build
242-
STAMP_DIR ${PROJECT_BINARY_DIR}/external/libtaylor-stamp
243-
TMP_DIR ${PROJECT_BINARY_DIR}/external/libtaylor-tmp
244-
INSTALL_DIR ${PROJECT_BINARY_DIR}/external
245-
CMAKE_ARGS ${TaylorCMakeArgs})
246-
endif()
226+
ExternalProject_Add(libtaylor
227+
PREFIX ${PROJECT_SOURCE_DIR}/external
228+
SOURCE_DIR ${PROJECT_SOURCE_DIR}/external/libtaylor
229+
BINARY_DIR ${PROJECT_BINARY_DIR}/external/libtaylor-build
230+
STAMP_DIR ${PROJECT_BINARY_DIR}/external/libtaylor-stamp
231+
TMP_DIR ${PROJECT_BINARY_DIR}/external/libtaylor-tmp
232+
INSTALL_DIR ${PROJECT_BINARY_DIR}/external
233+
CMAKE_ARGS ${TaylorCMakeArgs})
247234

248235
configure_files()
249236

TODO

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,8 @@ the issue number.
66

77
10 December 2013
88
----------------
9-
3. Define which part of the documentation goes into a
10-
release (#578)
119
5. Draw a better logo for the library (both programmers'
1210
and users' manuals)
13-
6. Draw a diagram explaining the structure of the library
14-
and the relationships between different parts of it
15-
(programmers' manual only)
16-
7. Implementation of input management as asked by Andy
17-
and Daniel
1811

1912
10 April 2014
2013
-------------

external/libtaylor/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
2+
3+
install(FILES
4+
ctaylor.hpp ctaylor_math.hpp micromath.hpp polymul.hpp taylor.hpp taylor_math.hpp tmath.hpp
5+
DESTINATION include)

external/libtaylor/README

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Libtaylor 0.5
2+
by Ulf Ekstrom <[email protected]> 2009.
3+
4+
This library is released under the LGPL license,
5+
but since the library is implemented as templates
6+
you most likely cannot distribute it together with
7+
your closed source program.

0 commit comments

Comments
 (0)