mirror of
https://github.com/NGSolve/netgen.git
synced 2024-12-27 06:10:34 +05:00
f6a0b31b96
- 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
43 lines
1.3 KiB
CMake
43 lines
1.3 KiB
CMake
add_definitions(-DNGLIB_EXPORTS)
|
|
|
|
if(WIN32)
|
|
set(nglib_objects
|
|
$<TARGET_OBJECTS:mesh>
|
|
$<TARGET_OBJECTS:stlvis>
|
|
$<TARGET_OBJECTS:stl>
|
|
$<TARGET_OBJECTS:geom2dvis>
|
|
$<TARGET_OBJECTS:interface>
|
|
$<TARGET_OBJECTS:geom2d>
|
|
$<TARGET_OBJECTS:csg>
|
|
$<TARGET_OBJECTS:stl>
|
|
$<TARGET_OBJECTS:gen>
|
|
$<TARGET_OBJECTS:la>
|
|
$<TARGET_OBJECTS:gprim>
|
|
|
|
$<TARGET_OBJECTS:visual>
|
|
$<TARGET_OBJECTS:csgvis>
|
|
$<TARGET_OBJECTS:occ>
|
|
)
|
|
endif(WIN32)
|
|
|
|
add_library(nglib SHARED nglib.cpp ${nglib_objects})
|
|
if(NOT WIN32)
|
|
target_link_libraries( nglib mesh stl interface geom2d csg stl visual)
|
|
if(USE_GUI)
|
|
target_link_libraries( nglib stlvis geom2dvis csgvis )
|
|
endif(USE_GUI)
|
|
endif(NOT WIN32)
|
|
|
|
target_link_libraries( nglib ${OCC_LIBRARIES} ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${X11_Xmu_LIB} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} ${OCC_LIBRARIES} )
|
|
|
|
if(USE_OCC AND NOT WIN32)
|
|
target_link_libraries(nglib occ)
|
|
endif(USE_OCC AND NOT WIN32)
|
|
|
|
if(USE_PYTHON)
|
|
target_link_libraries(nglib ${PYTHON_LIBRARIES})
|
|
endif(USE_PYTHON)
|
|
|
|
install(TARGETS nglib ${NG_INSTALL_DIR})
|
|
install(FILES nglib.h DESTINATION ${NG_INSTALL_DIR_INCLUDE}/include COMPONENT netgen_devel)
|