diff --git a/src/3rdParty/salomesmesh/CMakeLists.txt b/src/3rdParty/salomesmesh/CMakeLists.txt index 144edf1d77..ffd6c1ea15 100644 --- a/src/3rdParty/salomesmesh/CMakeLists.txt +++ b/src/3rdParty/salomesmesh/CMakeLists.txt @@ -1,5 +1,4 @@ -# SGEOM cmake build file -#PROJECT(SMESH Fortran CXX) + set(CMAKE_AUTOMOC FALSE) SET(SMESH_VERSION_MAJOR 7) # see main CMakeLists.txt of FreeCAD @@ -145,33 +144,7 @@ else(MSVC) endif(BUILD_FEM_NETGEN) endif(MSVC) - -#SET(CMAKE_BUILD_TYPE "Release") # By default, build in release mode -#SET(BUILD_SHARED_LIBS ON) -#SET(LIBRARY_OUTPUT_PATH cmake-build) SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -#INCLUDE_DIRECTORIES(inc) - -############# -# FindBoost # -############# -#FIND_PACKAGE(Boost REQUIRED) -#MESSAGE("-- Boost found: ${Boost_FOUND}") -#INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR}) -#MESSAGE("Popo: ${Boost_INCLUDE_DIR}") - - -######################################## -# OpenCASCADE include and lib location # -######################################## -# Find OpenCASCADE library, set include and lib path -#SET(OCC_INCLUDE_PATH ${OCC_INCLUDE_DIR}) -#SET(OCC_LIB_PATH ${OCC_LIBRARY_DIR}) - -# Tells CMake where are the required headers -#INCLUDE_DIRECTORIES(${OCC_INCLUDE_PATH}) -#LINK_DIRECTORIES(${OCC_LIB_PATH}) ############################ @@ -197,7 +170,6 @@ IF(UNIX) ELSE(UNIX) IF(WIN32) ######### Windows ########### - #MESSAGE("-- Windows system detected") IF(MSVC) ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB -DUSE_CLOCK -DMSDOS -DNO_ONEXIT -DNO_My_ctype -DNO_ISATTY -DNO_FPINIT /wd4290 /wd4251 /wd4018 /wd4800 /wd4996 /wd4244 /wd4805 /wd4806 /wd4275 /wd4005 /wd4099 /wd4101 /wd4146 /wd4267 /wd4390 /wd4503 /wd4436) ELSE(MSVC) @@ -233,14 +205,6 @@ if(WIN32) set_target_properties(Driver PROPERTIES COMPILE_FLAGS "-DMESHDRIVER_EXPORTS -DSMESHUtils_EXPORTS") endif(WIN32) - -#IF(WIN32) -# SET_TARGET_PROPERTIES(Driver PROPERTIES COMPILE_FLAGS "-DMESHDRIVER_EXPORTS") -#ENDIF(WIN32) -#IF(MINGW) -# SET_TARGET_PROPERTIES(Driver PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -#ENDIF(MINGW) - ############# # DriverSTL # ############# @@ -253,15 +217,6 @@ if(WIN32) set_target_properties(DriverSTL PROPERTIES COMPILE_FLAGS "-DMESHDRIVERSTL_EXPORTS -DSMESHUtils_EXPORTS -DBASICS_EXPORTS") endif(WIN32) - -#TARGET_LINK_LIBRARIES(DriverSTL TKernel TKMath Driver SMDS) -#IF(WIN32) -# SET_TARGET_PROPERTIES(DriverSTL PROPERTIES COMPILE_FLAGS "-DMESHDRIVERSTL_EXPORTS") -#ENDIF(WIN32) -#IF(MINGW) -# SET_TARGET_PROPERTIES(DriverSTL PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -#ENDIF(MINGW) - ############# # DriverDAT # ############# @@ -274,14 +229,6 @@ if(WIN32) set_target_properties(DriverDAT PROPERTIES COMPILE_FLAGS "-DMESHDRIVERDAT_EXPORTS") endif(WIN32) - -#IF(WIN32) -# SET_TARGET_PROPERTIES(DriverDAT PROPERTIES COMPILE_FLAGS "-DMESHDRIVERDAT_EXPORTS") -#ENDIF(WIN32) -#IF(MINGW) -# SET_TARGET_PROPERTIES(DriverDAT PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -#ENDIF(MINGW) - ############# # DriverUNV # ############# @@ -294,14 +241,6 @@ if(WIN32) set_target_properties(DriverUNV PROPERTIES COMPILE_FLAGS "-DMESHDRIVERUNV_EXPORTS") endif(WIN32) - -#IF(WIN32) -# SET_TARGET_PROPERTIES(DriverUNV PROPERTIES COMPILE_FLAGS "-DMESHDRIVERUNV_EXPORTS") -#ENDIF(WIN32) -#IF(MINGW) -# SET_TARGET_PROPERTIES(DriverUNV PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -#ENDIF(MINGW) - ########### # SMESHDS # ########### @@ -311,11 +250,6 @@ TARGET_LINK_LIBRARIES(SMESHDS ${SMESH_LIBS} SMDS ${Boost_LIBRARIES} ) SET_BIN_DIR(SMESHDS SMESHDS) - -#IF(MINGW) -# SET_TARGET_PROPERTIES(SMESHDS PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -#ENDIF(MINGW) - ######### # SMESH # ######### @@ -327,71 +261,22 @@ SET_BIN_DIR(SMESH SMESH) if(WIN32) set_target_properties(SMESH PROPERTIES COMPILE_FLAGS "-DSMESH_EXPORTS -DSMESHCONTROLS_EXPORTS -DSMESHimpl_EXPORTS -DMESHDriverGMF_EXPORTS -DMESHDRIVERMED_EXPORTS -DMEDWRAPPER_EXPORTS -DMEDWRAPPER_BASE_EXPORTS -DMEDWRAPPER_FACTORY_EXPORTS -DSMESHUtils_EXPORTS -DUTILS_EXPORTS -DMEDWRAPPER_V2_2_EXPORTS") endif(WIN32) - - - #IF(WIN32) -# SET_TARGET_PROPERTIES(SMESH PROPERTIES COMPILE_FLAGS "-DSMESHimpl_EXPORTS -DSMESHCONTROLS_EXPORTS") -#ENDIF(WIN32) -#IF(MINGW) -# SET_TARGET_PROPERTIES(SMESH PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -#ENDIF(MINGW) - ############## # MEFISTO2 # ############## -#if (MSVC) - #IF(CMAKE_SIZEOF_VOID_P EQUAL 8) - # # Mefisto2f.lib was built using f2c which created - # # all function names with an '_' at the end. - # FILE(GLOB MEFISTO2_source_files - # src/MEFISTO2/*.cpp - # inc/Rn.h - # inc/aptrte.h - # ) - #ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8) - # FILE(GLOB MEFISTO2_source_files - # src/MEFISTO2/*.cpp - # src/MEFISTO2/MEFISTO2F.def - # inc/Rn.h - # inc/aptrte.h - # ) - #ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8) - - set(MEFISTO2_source_files - src/MEFISTO2/aptrte.cpp - src/MEFISTO2/trte.c - inc/Rn.h - inc/aptrte.h - ) - -#else(MSVC) -# FILE(GLOB MEFISTO2_source_files -# src/MEFISTO2/*.cpp -# src/MEFISTO2/trte.f -# inc/Rn.h -# inc/aptrte.h -# ) -#endif(MSVC) +set(MEFISTO2_source_files + src/MEFISTO2/aptrte.cpp + src/MEFISTO2/trte.c + inc/Rn.h + inc/aptrte.h +) ADD_LIBRARY(MEFISTO2 SHARED ${MEFISTO2_source_files}) SET_BIN_DIR(MEFISTO2 MEFISTO2) -#if(MSVC) - TARGET_LINK_LIBRARIES(MEFISTO2 ${SMESH_LIBS}) # in case of Windows link the prebuild Fortran lib - set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "-DMEFISTO2D_EXPORTS") -# if(CMAKE_SIZEOF_VOID_P EQUAL 8) -# set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "-DMEFISTO2D_EXPORTS") -# else(CMAKE_SIZEOF_VOID_P EQUAL 8) -# set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "-DMEFISTO2D_EXPORTS -D__WATCOM__") -# endif(CMAKE_SIZEOF_VOID_P EQUAL 8) -#elseif(MINGW) -# TARGET_LINK_LIBRARIES(MEFISTO2 ${SMESH_LIBS} gfortran) -# set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "-DMEFISTO2D_EXPORTS") -#else(MSVC) -# TARGET_LINK_LIBRARIES(MEFISTO2 ${SMESH_LIBS} gfortran) -# set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "${MEFISTO2_CFLAGS}") -#endif(MSVC) +TARGET_LINK_LIBRARIES(MEFISTO2 ${SMESH_LIBS}) # in case of Windows link the prebuild Fortran lib +set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "-DMEFISTO2D_EXPORTS") ############## @@ -408,15 +293,6 @@ else(WIN32) set_target_properties(StdMeshers PROPERTIES COMPILE_FLAGS "${StdMeshers_CFLAGS}") endif(WIN32) - -#SET(StdMeshers_CFLAGS "") -#IF(WIN32) -# SET(StdMeshers_CFLAGS "-DSTDMESHERS_EXPORTS -DMEFISTO2D_EXPORTS") -#ENDIF(WIN32) -#IF(MINGW) -# SET_TARGET_PROPERTIES(StdMeshers PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -#ENDIF(MINGW) - # Disable for all other compilers but MSVC if (BUILD_FEM_NETGEN) @@ -433,24 +309,11 @@ if(WIN32) else() set_target_properties(NETGENPlugin PROPERTIES COMPILE_FLAGS "${NETGEN_CXX_FLAGS}") endif(WIN32) -IF(NOT NETGEN_VERSION_C LESS NETGEN_VERSION_62_2004) # Version >= 6.2.2004 + set_target_properties(NETGENPlugin PROPERTIES CXX_STANDARD_REQUIRED ON) set_target_properties(NETGENPlugin PROPERTIES CXX_STANDARD 17) # Standard std=c++1y could work as well -ELSEIF(NOT NETGEN_VERSION_C LESS NETGEN_VERSION_62) # Version >= 6.2 - set_target_properties(NETGENPlugin PROPERTIES CXX_STANDARD_REQUIRED ON) - set_target_properties(NETGENPlugin PROPERTIES CXX_STANDARD 14) # Standard std=c++1y could work as ell -ENDIF() - endif (BUILD_FEM_NETGEN) -#IF(WIN32) -# SET_TARGET_PROPERTIES(SMESH PROPERTIES COMPILE_FLAGS "-DNETGENPluginimpl_EXPORTS ") -#ENDIF(WIN32) -#IF(MINGW) -# SET_TARGET_PROPERTIES(SMESH PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -#ENDIF(MINGW) - - if(WIN32) INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV SMESHDS SMESH MEFISTO2 StdMeshers RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}