mirror of
https://github.com/NGSolve/netgen.git
synced 2024-12-26 05:50:32 +05:00
Merge branch 'looooo-patch-1'
This commit is contained in:
commit
f3950af799
@ -9,9 +9,7 @@ add_library(interface ${NG_LIB_TYPE}
|
|||||||
|
|
||||||
if(NOT WIN32)
|
if(NOT WIN32)
|
||||||
target_link_libraries(interface mesh csg geom2d)
|
target_link_libraries(interface mesh csg geom2d)
|
||||||
if(USE_GUI)
|
target_link_libraries(interface visual)
|
||||||
target_link_libraries(interface visual)
|
|
||||||
endif(USE_GUI)
|
|
||||||
install( TARGETS interface ${NG_INSTALL_DIR})
|
install( TARGETS interface ${NG_INSTALL_DIR})
|
||||||
endif(NOT WIN32)
|
endif(NOT WIN32)
|
||||||
|
|
||||||
|
@ -4,13 +4,17 @@ add_library(occ ${NG_LIB_TYPE}
|
|||||||
Partition_Loop.cxx Partition_Loop2d.cxx Partition_Loop3d.cxx Partition_Spliter.cxx
|
Partition_Loop.cxx Partition_Loop2d.cxx Partition_Loop3d.cxx Partition_Spliter.cxx
|
||||||
occconstruction.cpp occgenmesh.cpp occgeom.cpp occmeshsurf.cpp python_occ.cpp
|
occconstruction.cpp occgenmesh.cpp occgeom.cpp occmeshsurf.cpp python_occ.cpp
|
||||||
)
|
)
|
||||||
|
if(USE_GUI)
|
||||||
add_library(occvis ${NG_LIB_TYPE} vsocc.cpp)
|
add_library(occvis ${NG_LIB_TYPE} vsocc.cpp)
|
||||||
|
endif(USE_GUI)
|
||||||
|
|
||||||
if(NOT WIN32)
|
if(NOT WIN32)
|
||||||
target_link_libraries( occ ${OCC_LIBRARIES} ${PYTHON_LIBRARIES})
|
target_link_libraries( occ ${OCC_LIBRARIES} ${PYTHON_LIBRARIES})
|
||||||
target_link_libraries( occvis occ )
|
install( TARGETS occ ${NG_INSTALL_DIR})
|
||||||
install( TARGETS occ occvis ${NG_INSTALL_DIR})
|
if (USE_GUI)
|
||||||
|
target_link_libraries( occvis occ )
|
||||||
|
install( TARGETS occvis ${NG_INSTALL_DIR})
|
||||||
|
endif(USE_GUI)
|
||||||
endif(NOT WIN32)
|
endif(NOT WIN32)
|
||||||
|
|
||||||
install(FILES
|
install(FILES
|
||||||
|
Loading…
Reference in New Issue
Block a user