Commit Graph

118 Commits

Author SHA1 Message Date
Matthias Hochsteger
7a1344bfcb cmake variable NG_COMPILE_FLAGS to set additional compile options 2020-10-01 13:35:53 +02:00
Matthias Hochsteger
cb610b9b04 NETGEN_CHECK_RANGE -> NETGEN_USE_CHECK_RANGE in netgen_config.hpp (macro name already used) 2020-09-09 11:53:05 +02:00
Matthias Hochsteger
52b372718c generate netgen_config.hpp containing all cmake options 2020-09-09 11:33:06 +02:00
Matthias Hochsteger
fa1a5d11ee Fix version file generation 2020-07-25 08:41:17 +02:00
Matthias Hochsteger
68f5605866 Fix version parsing in conda build 2020-07-24 17:13:22 +02:00
Matthias Hochsteger
dcc0484be0 install netgen_version.hpp, set version in Archive 2020-07-23 16:25:06 +02:00
Christopher Lackner
d2cb67f681 fix cmake warning 2020-06-19 17:36:48 +02:00
Matthias Hochsteger
34a6777f49 add file generate_version_file.cmake 2020-05-18 17:54:09 +02:00
Matthias Hochsteger
267e8b33fb cmake - use git to generate version string 2020-05-18 15:55:40 +02:00
Matthias Hochsteger
a52ccd7ce5 Fix build with USE_NUMA=ON 2020-03-25 10:40:12 +01:00
Matthias Hochsteger
8fd08ef4ac Download prebuilt CGNS library on MacOS 2020-03-11 21:41:38 +01:00
Matthias Hochsteger
603141cf1a Fix CGNS support on Windows 2020-03-11 14:53:08 +00:00
Matthias Hochsteger
db5ad09b79 Initial CGNS format read support 2020-03-11 13:39:40 +01:00
Matthias Hochsteger
0bcee4d6b0 Fix FindOpenCasCade.cmake 2020-03-02 17:04:11 +01:00
Matthias Hochsteger
ce90bd9e83 [cmake] Simplify compile flag handling on Windows
Add options/define flags to ngcore, so they are automatically passed on
to dependencies
2020-01-16 16:38:06 -08:00
Matthias Hochsteger
09afc419bc [cmake] option USE_NATIVE_ARCH for Windows 2020-01-15 16:49:27 -08:00
Matthias Hochsteger
19124f8d30 [cmake] Fix Windows build with spaces in build dir 2019-12-10 17:02:48 +00:00
Matthias Hochsteger
f3d9d3ad67 [cmake] Don't link python libraries in unix-conda environment
Conda links python libs statically to python executable
2019-11-26 19:26:18 +00:00
Matthias Hochsteger
84eed492ca [cmake] Export CHECK_RANGE settings 2019-11-04 17:22:59 +01:00
Matthias Hochsteger
db2656132c Link OCC lib TKVCAF only for occ>=7.3.0 2019-10-28 17:03:59 +01:00
Matthias Hochsteger
396d7cdcd2 Option to link static build of OpenCascade 7.4.0
For static builds, freetype must be linked explicitly
2019-10-28 14:21:39 +01:00
Lukas Kogler
0e7cfecf7a use parmetis metis in netgen 2019-10-01 09:48:38 +00:00
Matthias Hochsteger
5be787f1a2 Use own fork of Tcl/Tk for MacOS (with configure scripts checked in) 2019-09-04 10:01:32 +02:00
Matthias Hochsteger
26fcc2b177 Build Tcl/Tk 8.6.10-rc on MacOS 2019-09-02 23:35:02 +02:00
Matthias Hochsteger
cf1a83edcd [cmake] Build TkDND instead of downloading the binary
This was changed accidentally in commit
  9cbb51434b
  [cmake] Build Tcl/Tk 8.6.9 on MacOS
2019-09-02 22:42:51 +02:00
Matthias Hochsteger
9cbb51434b [cmake] Build Tcl/Tk 8.6.9 on MacOS 2019-08-26 10:11:51 +00:00
Christopher Lackner
13fa0acb2b pass BUILD_STUB_FILES option to superbuild 2019-06-30 12:52:08 +02:00
Matthias Hochsteger
b34f0b5333 Fix METIS download url, update to 5.1.0-p6 2019-06-02 23:12:56 +02:00
Lukas
89aa6eb374 hand C++ compiler to metis 2019-05-17 14:15:15 +02:00
Matthias Hochsteger
6e53e3c3e8 [cmake] Change link to metis sources 2019-05-17 13:10:37 +02:00
Lukas
efebb1a6e3 only give metis C compiler 2019-04-17 15:04:24 +02:00
Lukas
6f91ab5a2c always build metis with position independent code 2019-04-17 10:45:54 +02:00
Matthias Hochsteger
c0d0a3a1ab [cmake] Fix Python version check 2019-01-18 12:32:10 +01:00
Christopher Lackner
5602322e94 add RangeException, NETGEN_CHECK_RANGE macro 2019-01-02 16:30:55 +01:00
Christopher Lackner
fd3474f5cb logging in ngcore 2018-12-28 13:43:15 +01:00
Matthias Hochsteger
695a55e247 Fix tkdnd patch for MacOSX 2018-12-14 11:46:21 +01:00
Christopher Lackner
c5af003bba Merge remote-tracking branch 'gitlab/master' into ngcore 2018-12-13 13:19:40 +01:00
Christopher Lackner
17aba88117 [ngcore] follow cpp guidelines, check them with clang-tidy 2018-12-08 16:10:29 +01:00
Matthias Hochsteger
ed494caa44 [cmake] Build tkdnd with CMake and correct Tcl/Tk version 2018-12-06 17:03:56 +01:00
Christopher Lackner
8e29d38fc1 archive works for pointers and shared_ptrs (even with
mult. inheritance and virtual base classes)
2018-12-03 16:28:04 +01:00
Matthias Hochsteger
f1dc069052 [cmake] Propagate CMAKE_OSX_SYSROOT 2018-10-03 16:11:45 +02:00
Matthias Hochsteger
502413fb02 [cmake] Propagate CMAKE_OSX_DEPLOYMENT_TARGET 2018-10-02 15:32:45 +02:00
Matthias Hochsteger
28f26ae326 [cmake] Use other mirror for metis sources 2018-09-22 12:50:59 +02:00
Matthias Hochsteger
f29a78d426 [cmake] Use tcl/tk provided by Python 3.7 on MacOS 2018-08-28 18:31:54 +02:00
Matthias Hochsteger
9d361a354a Revert "[cmake] Use relative paths for dependencies inside install dir"
This reverts commit f098532aa1.
2018-07-02 12:25:18 +02:00
Matthias Hochsteger
f098532aa1 [cmake] Use relative paths for dependencies inside install dir 2018-07-02 03:15:13 -07:00
Matthias Hochsteger
90dee5fde4 Define PACKAGE_VERSION in mydefs.hpp
Change "PACKAGE_VERSION" to "NETGEN_VERSION" in NetgenConfig.cmake
2018-02-02 11:22:08 +01:00
Matthias Hochsteger
0257f416b2 [cmake] Search pybind11 if USE_SUPERBUILD=OFF
Also don't install the pybind headers without superbuild
2018-01-25 14:01:57 +01:00
Matthias Hochsteger
b1cb2883e7 [cmake] Fix default install dir for Python modules 2017-11-13 13:48:22 +01:00
Matthias Hochsteger
03f73094e9 [windows] New repo for external dependencies
Separate fils for zlib, TCL/TK and OCC dependencies to fix the
superbuild with USE_GUI=OFF
Download dependencies from github.com/NGSolve/ngsolve_dependencies
2017-11-13 02:38:13 -08:00
Matthias Hochsteger
c55ad18a73 Fix build/image export with USE_JPEG=ON
- fixes broken build with USE_JPEG
 - cleanes up the screenshot code itself (there were problems with memory
   alignment, now enforce alignment of 1 byte)
 - proper error message if 'convert' is not working
 - append '.ppm' to file for temporary filename instead of replacing last
   three characters
2017-09-22 11:26:10 +02:00
Matthias Hochsteger
ac59096f91 [CMake] Fix typo (search for TCL) 2017-09-19 10:24:48 +02:00
Matthias Hochsteger
b21fc55c3c Disable TKDND build on Linux 2017-09-15 10:34:42 +02:00
Matthias Hochsteger
99a3c55cdc Build TKDND on Linux 2017-09-14 16:35:43 +02:00
Joachim Schöberl
385ea4b06d fix path for installing tkdnd on MacOS 2017-09-14 14:04:29 +02:00
Matthias Hochsteger
cb858a0eec Build tkdnd on MacOS 2017-09-14 13:42:43 +02:00
Matthias
80355b43cb Set path to TCL/TK libs explicitly on Windows 2017-06-22 15:01:11 +02:00
Matthias Hochsteger
e09542e7c1 Fix CMake error (missing quotes, thx to Gerhard) 2017-06-07 10:53:46 +02:00
Matthias Hochsteger
08823c179d Fix CMake warning, normalize paths 2017-06-02 14:50:27 +02:00
Matthias Hochsteger
ed453a5fbc CMake - export install dir settings 2017-05-31 14:09:48 +02:00
Matthias Hochsteger
cbf36efbd3 Fixes in NetgenConfig.cmake 2017-05-30 00:03:22 +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
025f8750be GUI support from Python and some cleanup
Squashed commit of the following:

commit 5058ceb9351548937487aa94073e7f59236ae9fe
Merge: d37f0af 2da1465
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 19:33:55 2017 +0200

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

commit d37f0afcc1389c0c3ec0899da9c1af158c926ca5
Author: Matthias <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 19:27:12 2017 +0200

    link gui to netgen, some fixes

commit 297141455cd4fab81709c13d6253ad8114beee4a
Author: Matthias <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 19:02:47 2017 +0200

    windows fixes

commit 9bf290a60835f29762b15ee3b722da132678f90c
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 18:59:53 2017 +0200

    More cleanup, proper code separation

     ... between netgen exectuable and gui library

commit f46d438d3c9dd32f9f94642b4ec00b85611ef1dd
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 14:03:53 2017 +0200

    fix typos

commit b3d301ff4e321189aef469bff77f7cffa7b69e98
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 13:32:57 2017 +0200

    also link tk to togl on windows...

commit c3519abee7b041e45c913a45999ed2d29d4ff325
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 13:30:16 2017 +0200

    link TCL to togl on windows

commit 80b607436b45f38f4bac2708a78ef03561ad44e5
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 13:26:45 2017 +0200

    linkt TCL only to netgen executable

commit 080139a431e949e14cb9f05194e19c5129aca3d3
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 13:20:36 2017 +0200

    fix dll ex/import

commit dd68efacb01fbbbe3f136168f12fed41fa3c3c8a
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 13:15:39 2017 +0200

    fix dll export

commit 9023b9ca49b4c2b99f228f64564990e2d0246b8c
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 12:06:14 2017 +0200

    use system tcl/tk on MacOS, but download tcl/tk for windows

commit 16eb4c1b01eb5229f93274791187b2c666bb8b8e
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 12:01:36 2017 +0200

    more cleanup

commit 6df5b82a7d9a1177a755446d563d6c4b98ff6329
Merge: af23786 2b0d3f0
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 11:45:42 2017 +0200

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

commit af2378637a6513de3b50841ed6314cd7e12f7205
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 11:45:40 2017 +0200

    some cleanup

commit 81bbe117efe25df53c71f9ae603c50ee4557703a
Author: Joachim Schöberl <joachim.schoeberl@tuwien.ac.at>
Date:   Tue May 9 20:14:46 2017 +0200

    tk-gui

commit 387e6da678661dd3b9d75d696733f46fe43d789a
Merge: e658b5b e653d8e
Author: Joachim Schöberl <joachim.schoeberl@tuwien.ac.at>
Date:   Tue May 9 18:49:20 2017 +0200

    Merge remote-tracking branch 'origin/gui_from_python' into native_tcl_macos

commit e658b5b2c1ac3264f4165b5f6d2b821b3b1b0926
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Tue May 9 18:30:35 2017 +0200

    use native tcl on macos

commit e653d8e6789d20e24b16a68bf760415940e881f8
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 8 16:37:23 2017 +0200

    next fix

commit f663c80b00754d141a02fa6abde2077c841bbafb
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 8 16:23:21 2017 +0200

    Fix symbol export on windows

commit 70d99782423d33d3fa6f80e758a7377d0cb52840
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 8 15:14:56 2017 +0200

    GUI support from Python

    Enables experimental support for starting the Netgen GUI from Python
    directly.
    To use it, just import the gui module:
    > import netgen.gui
2017-05-10 19:34:42 +02:00
Matthias Hochsteger
85a79f0ca1 Enable TkDND on MacOS 2017-04-07 16:52:01 +02:00
Matthias Hochsteger
9c42c734cf Only build Metis on Unix platforms 2017-03-10 16:01:00 +01:00
Matthias Hochsteger
612cd79aa0 remove unused file 2017-03-10 15:58:23 +01:00
Matthias Hochsteger
dbe599a6db MacOS fix 2017-02-23 15:36:14 +01:00
Matthias Hochsteger
0659961f28 Restructure cmake files, build METIS as dependency 2017-02-23 14:54:42 +01:00