mirror of
https://github.com/NGSolve/netgen.git
synced 2025-01-13 06:30:34 +05:00
025f8750be
Squashed commit of the following: commit 5058ceb9351548937487aa94073e7f59236ae9fe Merge: d37f0af2da1465Author: 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: af237862b0d3f0Author: 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
54 lines
1.8 KiB
CMake
54 lines
1.8 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)
|
|
|
|
# if(NOT WIN32)
|
|
# add_executable(ng_vol ng_vol.cpp ${nglib_objects})
|
|
# target_link_libraries( ng_vol nglib ${OCC_LIBRARIES} ${MPI_CXX_LIBRARIES} )
|
|
# target_link_libraries( ng_vol nglib interface geom2d csg stl occ mesh )
|
|
#
|
|
# add_executable(ng_stl ng_stl.cpp ${nglib_objects})
|
|
# target_link_libraries( ng_stl nglib ${OCC_LIBRARIES} ${OCC_OCAF_LIBRARIES} ${MPI_CXX_LIBRARIES} )
|
|
# target_link_libraries( ng_stl nglib interface geom2d csg stl occ mesh )
|
|
#
|
|
# install(TARGETS nglib ng_vol ng_stl ${ng_install_dir})
|
|
# endif(NOT WIN32)
|
|
|
|
install(TARGETS nglib ${ng_install_dir})
|