diff --git a/CMakeLists.txt b/CMakeLists.txt index e5a99d3c..63a74bc1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,6 @@ string(TIMESTAMP NETGEN_VERSION_PATCH "%y%U%w" ) set(NETGEN_VERSION "${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR}-dev") set(PACKAGE_VERSION "${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR}-${NETGEN_VERSION_PATCH}") set(CPACK_PACKAGE_VERSION "${PACKAGE_VERSION}") -# set(CPACK_DEBIAN_PACKAGE_VERSION "${PACKAGE_VERSION}" ####################################################################### @@ -133,8 +132,6 @@ if(WIN32) get_WIN32_WINNT(ver) add_definitions(-D_WIN32_WINNT=${ver} -DWNT -DWNT_WINDOW -DNOMINMAX) set(CMAKE_MFC_FLAG 0) -# add_definitions(-DNGINTERFACE_EXPORTS) -# add_definitions(-DNGLIB_EXPORTS) add_definitions(-DMSVC_EXPRESS -D_CRT_SECURE_NO_WARNINGS -DHAVE_STRUCT_TIMESPEC) # build convenience (aka object) libraries in windows) set(NG_LIB_TYPE OBJECT) @@ -145,9 +142,7 @@ else(WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") endif(WIN32) if(APPLE) -# set(MACOSX_BUNDLE ON) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup") -# set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") endif(APPLE) ####################################################################### diff --git a/libsrc/interface/CMakeLists.txt b/libsrc/interface/CMakeLists.txt index aca57060..29213966 100644 --- a/libsrc/interface/CMakeLists.txt +++ b/libsrc/interface/CMakeLists.txt @@ -1,11 +1,5 @@ add_definitions(-DNGINTERFACE_EXPORTS) add_library(interface ${NG_LIB_TYPE} -# $ -# $ -# $ -# $ -# $ -# $ nginterface.cpp nginterface_v2.cpp read_fnf_mesh.cpp readtetmesh.cpp readuser.cpp writeabaqus.cpp writediffpack.cpp writedolfin.cpp writeelmer.cpp writefeap.cpp writefluent.cpp writegmsh.cpp writejcm.cpp @@ -13,8 +7,6 @@ add_library(interface ${NG_LIB_TYPE} wuchemnitz.cpp writegmsh2.cpp writeOpenFOAM15x.cpp ) -# TARGET_LINK_LIBRARIES(interface ${MPI_CXX_LIBRARIES} ${PYTHON_LIBS}) -# TARGET_LINK_LIBRARIES( interface ${LIBPTHREAD} ${OCC_LIBRARIES} ${LIBTOGL} ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} ${TK_LIBRARY} ${TCL_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${X11_Xmu_LIB} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} ) if(NOT WIN32) target_link_libraries(interface mesh csg geom2d) if(USE_GUI) diff --git a/libsrc/visualization/CMakeLists.txt b/libsrc/visualization/CMakeLists.txt index ceedbc7b..273829a6 100644 --- a/libsrc/visualization/CMakeLists.txt +++ b/libsrc/visualization/CMakeLists.txt @@ -1,8 +1,6 @@ add_definitions(-DNGINTERFACE_EXPORTS) install(FILES soldata.hpp DESTINATION ${INCDIR} COMPONENT netgen_devel ) -# AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(OCCFLAGS) $(TCL_INCLUDES) - if(USE_GUI) set( LIB_VISUAL_SOURCES meshdoc.cpp mvdraw.cpp vsfieldlines.cpp vsmesh.cpp vssolution.cpp importsolution.cpp ) else(USE_GUI) diff --git a/nglib/CMakeLists.txt b/nglib/CMakeLists.txt index e56feec0..a61556bc 100644 --- a/nglib/CMakeLists.txt +++ b/nglib/CMakeLists.txt @@ -38,16 +38,4 @@ 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}) diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index 78b81fba..e69de29b 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -1,3 +0,0 @@ -# dist_noinst_DATA = netgen.sln netgen.vcproj \ -# postBuild_netgen.bat nglib.sln nglib.vcproj \ -# postBuild_nglib.bat netgen.ico netgen.rc