ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-11-11 16:49:16 +05:00
Code Issues Packages Projects Releases Wiki Activity
1,410 Commits 10 Branches 43 Tags 18 MiB
1e9e376d2e
Commit Graph

66 Commits

Author SHA1 Message Date
lkogler
1e9e376d2e prettied it all up a bit 2017-06-09 20:56:19 +02:00
Matthias Hochsteger
08823c179d Fix CMake warning, normalize paths 2017-06-02 14:50:27 +02:00
Matthias Hochsteger
cb3af7ab55 Remove config.h 2017-06-01 10:15:25 +02:00
Matthias Hochsteger
97f4c17d96 Fix default install dir for cmake files 2017-05-30 08:38:48 +02:00
Matthias Hochsteger
f6a0b31b96 Cleanup CMake build system 
- Use CMAKE_INSTALL_PREFIX instead of INSTALL_DIR
  - Allow finer control of install directories
  - Use compiled TCL code by default
  - Fix RPATH usage on Linux and MacOSX

### Allow finer control of install directories
The following variables can be set to either absolute or relative paths
NG_INSTALL_DIR_PYTHON: Python files
NG_INSTALL_DIR_BIN: Executables
NG_INSTALL_DIR_LIB: Libraries
NG_INSTALL_DIR_INCLUDE: header files
NG_INSTALL_DIR_CMAKE: CMake files
NG_INSTALL_DIR_RES: Resources

### Use compiled TCL code by default
The tcl files contained in Netgen are stored in onetcl.cpp as c-string.
This way it's not necessary to install tcl files or set NETGENDIR

### Fix RPATH usage on Linux and MacOSX
The Netgen installation should be completely relocatable now.

Squashed commit of the following:

commit 201eda5e62726bd87d76beb13c3e5643cd4c7810
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 21:10:08 2017 +0200

    cleanup

commit b4cd46a9d2f390b40c5223c8d9971f576b979644
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 20:47:46 2017 +0200

    fix

commit 6506a834dbee2fd7b6df3b3f3709d0b27344356f
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 20:41:45 2017 +0200

    allow gui test to fail

commit 56c5fc131f61259e6fb67b60f7fff955d2e8d2da
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 20:26:18 2017 +0200

    add python3-tk to docker images

commit 4d1b5aac1d028867339819599708a08f2098bbd6
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 11:22:18 2017 -0700

    windows fix

commit 92b5f8a95491ba3508143d7f1b94359edc0655ce
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 11:08:08 2017 -0700

    fix for windows

commit 3f7bf51434ef3b637b3563930ddb61d04af645cb
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 19:28:13 2017 +0200

    fixes, test for gui

commit ef1d0164a50fadf374e3b1e43a745b5f69a16ad6
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 19:06:55 2017 +0200

    fixes

commit 67645bb896012149c23c851b03287199c21fa129
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 17:24:58 2017 +0200

    netgen config

commit b587b77a282768719cffc366c56d82a1746e0be0
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 16:53:47 2017 +0200

    remove comments

commit 2b34cc78818afa1cf21484bd0976413a91db0851
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 05:03:00 2017 -0700

    fix windows

commit 9e98efa54065624e264eaf1acf74b44ef022a68d
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 13:42:11 2017 +0200

    fixes

commit 394b470a07d73431079f80caa36c7c7042077f40
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 12:24:40 2017 +0200

    fix rpath issue

commit 6787eae384a8592f90598258ccd8207cd499d9fc
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 11:37:05 2017 +0200

    some more fixes with install dir

commit fcf22659c60300e8d39d12e14b21c58a062e739c
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 01:34:06 2017 -0700

    some fixes

commit ede1f0c462978bb70d3b4e2251cb555a592e82e3
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 10:16:34 2017 +0200

    fixes

commit b6a1259876a77f54e419a44f1b44d03d5bb49b82
Merge: c79f9a3 6627b0b
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 24 09:35:50 2017 +0200

    Merge remote-tracking branch 'origin/master' into cmake_cleanup

commit c79f9a3421d4d2937c31dab4a601ce09d52b0e54
Merge: 99c3550 030ad1d
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 22 17:52:24 2017 +0200

    Merge remote-tracking branch 'origin/master' into cmake_cleanup

commit 99c35500850e08fdc847013bb384169b1483acb4
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Fri May 19 14:37:28 2017 +0200

    fix rpath

commit 8215e9748d9ee225266bc941da1ca252aebd27de
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Thu May 18 13:29:41 2017 +0200

    remove INSTALL_DIR, rename var to NETGEN_INSTALL_DIR_INCLUDE, install libngpy to python package folder

commit 23d028c4cf7572de9e2e277cda8f6b07b6b1d9f9
Merge: 57027c8 f72a247
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Thu May 18 12:03:59 2017 +0200

    Merge remote-tracking branch 'origin/master' into cmake_cleanup

commit 57027c8c706ff755bdf26887884bbdeca129fe8f
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Fri May 12 17:32:05 2017 +0200

    New CMake option: USE_INTERNAL_TCL (ON by default)

    This option uses the tcl code compiled in onetcl.cpp instead of separate
    tcl files by default. When set at configure time, no tcl files will be
    installed anymore.

commit 27ce5b7edd66d64e2453f5045f5ac08c313f7608
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Fri May 12 17:16:52 2017 +0200

    WIP: Cleanup of CMake files

      - Fix RPATH on Linux (TODO: other platforms)
      - New variables to specify install behaviour:
          NG_INSTALL_DIR_BIN
          NG_INSTALL_DIR_LIB
          NG_INSTALL_DIR_CMAKE
          NG_INSTALL_DIR_INCLUDE
 2017-05-29 21:41:27 +02:00
Matthias Hochsteger
c53913b4d1 Remove unused code in CMake files 2017-05-12 13:18:24 +02:00
Matthias Hochsteger
2ee076da4d Merge remote-tracking branch 'gitlab/master' into external_project_metis 2017-03-10 09:46:30 +01:00
Joachim Schöberl
8b6e057712 Merge branch 'fix_splinesurface' into 'master' 
fixes for SplineSurface lifetime, pytest

Sind ein paar fixes für die lifetimes von splinesurfaces. Die CSGeometry speichert jetzt die hinzugefügten SplineSurfaces (damit die shared_ptr nicht sterben)
Ich verwende std::vector für dynamische Arrays von shared_ptrs, da die Netgen Arrays nur mit trivialen Datentypen arbeiten können. (Könnte man evtl die NGSolve Arrays auch in Netgen verfügbar machen)
Der Rest der Änderungen sollte nur meine SplineSurfaces betreffen. 

Habe auch einen pytest hinzugefügt. Habe dafür mit Matthias die tests auch für Netgen aktiviert. 
Da ich das öfters testen musste habe ich die commits jetzt gesquashed

Ich hoffe das passt so.

LG
Christopher

See merge request !35
 2017-02-28 09:16:05 +01:00
Matthias Hochsteger
b48a2bbd5e Support (self written wrapper for) clcache on Windows 
Since clcache gets problems for .rc files, the ccache functionality is
disabled in the ng/ subdirectory
 2017-02-27 07:29:57 -08:00
Christopher Lackner
89fe31b550 Squashed commit of the following: 
commit fa556baaa222ba349d534027f7203588dcda6ad8
Author: Christopher Lackner <christopher.lackner@tuwien.ac.at>
Date:   Thu Feb 23 15:56:47 2017 +0100

    add python path to docker template

commit 54eb7eedc77ad8c86952c347536e7e1a854b62ed
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Thu Feb 23 14:59:45 2017 +0100

    install pytest in docker images

commit 3c1c755891e8372762130a6ed8c39cf056430264
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Thu Feb 23 14:52:32 2017 +0100

    enable CTest properly, add pytest

commit 4c4cf229ab8e7fd6057f535fb05c3079a9278f80
Author: Christopher Lackner <christopher.lackner@tuwien.ac.at>
Date:   Thu Feb 23 14:02:13 2017 +0100

    fix write splinesurface to savemesh

commit 069fbdbc529c9dd91644663f3f365e08be5af70e
Author: Christopher Lackner <christopher.lackner@tuwien.ac.at>
Date:   Thu Feb 23 09:03:26 2017 +0100

    fix lifetime of SplineSurface
 2017-02-23 16:41:27 +01:00
Matthias Hochsteger
0659961f28 Restructure cmake files, build METIS as dependency 2017-02-23 14:54:42 +01:00
Matthias Hochsteger
ea00690a2a fix for last commit 2017-02-22 12:48:15 +01:00
Matthias Hochsteger
dc1fb0a947 remove unused option 2017-02-16 15:01:16 +01:00
Matthias Hochsteger
bf9e550ed3 Add missing COMPONENT in install directive 2017-02-16 14:21:51 +01:00
Matthias Hochsteger
673aa7103d Allow building MacOS bundles without root permissions 2017-01-25 18:26:26 +01:00
Matthias Hochsteger
0c98422172 Remove unused CMake code 2017-01-16 15:01:57 +01:00
Matthias Hochsteger
4cff6b546a install all headers to INCDIR 2017-01-16 14:59:57 +01:00
Matthias Hochsteger
2d63931130 Fixes for MacOS build 2017-01-15 19:32:59 +01:00
Matthias Hochsteger
b9018982e1 Differen default install dir on MacOS 2017-01-10 18:40:26 +01:00
Matthias Hochsteger
d557e59a69 check for write permissions at INSTALL_DIR on Unix platforms 2017-01-10 12:02:04 +01:00
Matthias Hochsteger
35a8281d52 Fix Python include dir 2017-01-09 19:28:35 +01:00
Matthias Hochsteger
fc64b97e77 CMake: fix finding Python 3 libraries 2017-01-09 14:03:36 +01:00
Matthias Hochsteger
80536a3308 CMake: Add External projects to fetch and install some dependencies automatically on Windows and MacOS 2016-12-22 19:12:11 +01:00
Matthias Hochsteger
d95999161d CMake: export targets 2016-12-20 13:06:43 +01:00
Matthias Hochsteger
93d16ed1c3 Tix is not needed anymore 2016-12-05 23:07:00 -08:00
Joachim Schöberl
a2f434ebbf version 6.2-dev 2016-11-24 16:28:14 +01:00
Matthias Hochsteger
bba3b7ea41 ensure that config.h of Netgen build dir is used 2016-11-17 09:54:32 +01:00
Matthias Hochsteger
96c1235184 switch from boost::python to pybind11 2016-11-04 12:14:52 +01:00
Matthias Hochsteger
a351863f19 fix DEB file dependencies 2016-10-14 16:38:25 +02:00
Matthias
ba773c5d7a more robust macro to get WINNT version, fixes error "constant too big" in icon compilation on Windows (thx J. Schickmair) 2016-05-09 11:20:15 +02:00
Matthias Hochsteger
e526085a86 fix .deb dependencies for ubuntu xenial 2016-05-03 13:36:43 +02:00
Matthias
ad6785731f OpenCascade for Windows 2016-04-04 10:18:38 +02:00
Matthias Hochsteger
24324c1ab9 Don't install tix and tk_dnd on Mac if appropriate variables are not set 2016-03-15 17:49:58 +01:00
Matthias
1dfe0c28cb Togl2.1 for Windows 2016-03-10 11:09:02 +01:00
Matthias Hochsteger
767ee72a49 OpenCascade dependency in debian package 2016-03-01 18:25:48 +01:00
Joachim Schöberl
621d62d107 don't pack gcc-libs 2016-02-25 21:10:24 +01:00
Matthias
8a3e29e624 get rid of pthread 2016-02-23 20:23:48 +01:00
Joachim Schöberl
87180ba342 OSX: binary is called netgen again 2016-02-23 13:08:17 +01:00
Matthias Hochsteger
1b4f596446 get rid of OpenMP 2016-02-22 18:44:00 +01:00
Joachim Schöberl
bc3cbf1a41 fixes for nsopengl 2016-02-22 09:21:47 +01:00
Matthias Hochsteger
fcf5fd5fbb use CMAKE_PREFIX_PATH instead of ADDITIONAL_PATHS 2016-02-15 09:10:17 +01:00
Joachim Schöberl
8ee21da632 bundle filename 2016-02-09 09:18:24 +01:00
Matthias Hochsteger
066370bf29 environmen variable NETGEN_BUNDLE_NAME to set name of dmg file 2016-02-08 18:20:15 +01:00
Matthias Hochsteger
46ba39e6b4 include version in dmg filename 2016-02-08 16:54:50 +01:00
Joachim Schöberl
c98a55ab11 merge ttk branch to master 2016-02-08 15:53:16 +01:00
Matthias Hochsteger
5f83a4b2cc look for boost with lowercase component name 2016-01-11 02:22:02 -05:00
Matthias
b3451ed2e4 install boost lib and headers in windows 2016-01-07 11:31:10 +01:00
Joachim Schöberl
99f83757fb dmg bundle: icon 2015-12-21 20:21:36 +01:00
Joachim Schöberl
ca0fcb1e5e cpack gomp 2015-12-11 20:48:34 +01:00
Joachim Schöberl
f0ab057803 cpack mac fixes 2015-12-11 19:19:57 +01:00