diff --git a/src/3rdParty/salomesmesh/CMakeLists.txt b/src/3rdParty/salomesmesh/CMakeLists.txt index 21e321308f..79381c68c7 100644 --- a/src/3rdParty/salomesmesh/CMakeLists.txt +++ b/src/3rdParty/salomesmesh/CMakeLists.txt @@ -140,13 +140,13 @@ if(MSVC) elseif(MINGW) set_target_properties(SMDS PROPERTIES COMPILE_FLAGS "-DSMDS_EXPORTS") set_target_properties(SMDS PROPERTIES OUTPUT_NAME "SMDS") - set_target_properties(SMDS PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set_target_properties(SMDS PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(SMDS PROPERTIES PREFIX "") else(MSVC) set_target_properties(SMDS PROPERTIES OUTPUT_NAME "SMDS") - set_target_properties(SMDS PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set_target_properties(SMDS PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(SMDS PROPERTIES PREFIX "") - set_target_properties(SMDS PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/bin) + set_target_properties(SMDS PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) endif(MSVC) ########## @@ -165,13 +165,13 @@ if(MSVC) elseif(MINGW) set_target_properties(Driver PROPERTIES COMPILE_FLAGS "-DMESHDRIVER_EXPORTS") set_target_properties(Driver PROPERTIES OUTPUT_NAME "Driver") - set_target_properties(Driver PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set_target_properties(Driver PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(Driver PROPERTIES PREFIX "") else(MSVC) set_target_properties(Driver PROPERTIES OUTPUT_NAME "Driver") - set_target_properties(Driver PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set_target_properties(Driver PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(Driver PROPERTIES PREFIX "") - set_target_properties(Driver PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/bin) + set_target_properties(Driver PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) endif(MSVC) @@ -199,13 +199,13 @@ if(MSVC) elseif(MINGW) set_target_properties(DriverSTL PROPERTIES COMPILE_FLAGS "-DMESHDRIVERSTL_EXPORTS") set_target_properties(DriverSTL PROPERTIES OUTPUT_NAME "DriverSTL") - set_target_properties(DriverSTL PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set_target_properties(DriverSTL PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(DriverSTL PROPERTIES PREFIX "") else(MSVC) set_target_properties(DriverSTL PROPERTIES OUTPUT_NAME "DriverSTL") - set_target_properties(DriverSTL PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set_target_properties(DriverSTL PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(DriverSTL PROPERTIES PREFIX "") - set_target_properties(DriverSTL PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/bin) + set_target_properties(DriverSTL PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) endif(MSVC) @@ -233,13 +233,13 @@ if(MSVC) elseif(MINGW) set_target_properties(DriverDAT PROPERTIES COMPILE_FLAGS "-DMESHDRIVERDAT_EXPORTS") set_target_properties(DriverDAT PROPERTIES OUTPUT_NAME "DriverDAT") - set_target_properties(DriverDAT PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set_target_properties(DriverDAT PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(DriverDAT PROPERTIES PREFIX "") else(MSVC) set_target_properties(DriverDAT PROPERTIES OUTPUT_NAME "DriverDAT") - set_target_properties(DriverDAT PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set_target_properties(DriverDAT PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(DriverDAT PROPERTIES PREFIX "") - set_target_properties(DriverDAT PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/bin) + set_target_properties(DriverDAT PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) endif(MSVC) @@ -267,13 +267,13 @@ if(MSVC) elseif(MINGW) set_target_properties(DriverUNV PROPERTIES COMPILE_FLAGS "-DMESHDRIVERUNV_EXPORTS") set_target_properties(DriverUNV PROPERTIES OUTPUT_NAME "DriverUNV") - set_target_properties(DriverUNV PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set_target_properties(DriverUNV PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(DriverUNV PROPERTIES PREFIX "") else(MSVC) set_target_properties(DriverUNV PROPERTIES OUTPUT_NAME "DriverUNV") - set_target_properties(DriverUNV PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set_target_properties(DriverUNV PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(DriverUNV PROPERTIES PREFIX "") - set_target_properties(DriverUNV PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/bin) + set_target_properties(DriverUNV PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) endif(MSVC) @@ -299,13 +299,13 @@ if(MSVC) set_target_properties(SMESHDS PROPERTIES PREFIX "../") elseif(MINGW) set_target_properties(SMESHDS PROPERTIES OUTPUT_NAME "SMESHDS") - set_target_properties(SMESHDS PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set_target_properties(SMESHDS PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(SMESHDS PROPERTIES PREFIX "") else(MSVC) set_target_properties(SMESHDS PROPERTIES OUTPUT_NAME "SMESHDS") - set_target_properties(SMESHDS PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set_target_properties(SMESHDS PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(SMESHDS PROPERTIES PREFIX "") - set_target_properties(SMESHDS PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/bin) + set_target_properties(SMESHDS PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) endif(MSVC) @@ -330,12 +330,13 @@ if(MSVC) elseif(MINGW) set_target_properties(SMESH PROPERTIES COMPILE_FLAGS "-DSMESH_EXPORTS -DSMESHCONTROLS_EXPORTS -DSMESHimpl_EXPORTS") set_target_properties(SMESH PROPERTIES OUTPUT_NAME "SMESH") - set_target_properties(SMESH PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set_target_properties(SMESH PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(SMESH PROPERTIES PREFIX "") else(MSVC) set_target_properties(SMESH PROPERTIES OUTPUT_NAME "SMESH") + set_target_properties(SMESH PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(SMESH PROPERTIES PREFIX "") - set_target_properties(SMESH PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/bin) + set_target_properties(SMESH PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) endif(MSVC) @@ -379,14 +380,15 @@ elseif(MINGW) TARGET_LINK_LIBRARIES(MEFISTO2 ${SMESH_LIBS} gfortran) set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "-DMEFISTO2D_EXPORTS") set_target_properties(MEFISTO2 PROPERTIES OUTPUT_NAME "MEFISTO2") - set_target_properties(MEFISTO2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set_target_properties(MEFISTO2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(MEFISTO2 PROPERTIES PREFIX "") else(MSVC) TARGET_LINK_LIBRARIES(MEFISTO2 ${SMESH_LIBS} gfortran) set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "${MEFISTO2_CFLAGS}") set_target_properties(MEFISTO2 PROPERTIES OUTPUT_NAME "MEFISTO2") + set_target_properties(MEFISTO2 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(MEFISTO2 PROPERTIES PREFIX "") - set_target_properties(MEFISTO2 PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/bin) + set_target_properties(MEFISTO2 PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) endif(MSVC) @@ -407,7 +409,7 @@ elseif(MINGW) TARGET_LINK_LIBRARIES(StdMeshers SMESH ${SMESH_LIBS} MEFISTO2) set_target_properties(StdMeshers PROPERTIES COMPILE_FLAGS "-DSTDMESHERS_EXPORTS") set_target_properties(StdMeshers PROPERTIES OUTPUT_NAME "StdMeshers") - set_target_properties(StdMeshers PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set_target_properties(StdMeshers PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(StdMeshers PROPERTIES PREFIX "") else(MSVC) TARGET_LINK_LIBRARIES(StdMeshers SMESH ${SMESH_LIBS} MEFISTO2) @@ -419,8 +421,9 @@ else(MSVC) ENDIF(${CMAKE_SIZEOF_VOID_P} MATCHES "8") set_target_properties(StdMeshers PROPERTIES COMPILE_FLAGS "${StdMeshers_CFLAGS}") set_target_properties(StdMeshers PROPERTIES OUTPUT_NAME "StdMeshers") + set_target_properties(StdMeshers PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(StdMeshers PROPERTIES PREFIX "") - set_target_properties(StdMeshers PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/bin) + set_target_properties(StdMeshers PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) endif(MSVC) #SET(StdMeshers_CFLAGS "") @@ -450,12 +453,13 @@ if(MSVC) elseif(MINGW) set_target_properties(NETGENPlugin PROPERTIES COMPILE_FLAGS "-DNETGENPLUGIN_EXPORTS -DNO_PARALLEL_THREADS -DOCCGEOMETRY") set_target_properties(NETGENPlugin PROPERTIES OUTPUT_NAME "NETGENPlugin") - set_target_properties(NETGENPlugin PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set_target_properties(NETGENPlugin PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(NETGENPlugin PROPERTIES PREFIX "") else(MSVC) set_target_properties(NETGENPlugin PROPERTIES OUTPUT_NAME "NETGENPlugin") + set_target_properties(NETGENPlugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set_target_properties(NETGENPlugin PROPERTIES PREFIX "") - set_target_properties(NETGENPlugin PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/bin) + set_target_properties(NETGENPlugin PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) endif(MSVC) endif (FREECAD_BUILD_FEM_NETGEN) @@ -468,4 +472,27 @@ endif (FREECAD_BUILD_FEM_NETGEN) #ENDIF(MINGW) +if(WIN32) + INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV SMESHDS SMESH MEFISTO2 StdMeshers + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ) +else(WIN32) + INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV SMESHDS SMESH MEFISTO2 StdMeshers + LIBRARY DESTINATION lib + ) +endif(WIN32) + +if (FREECAD_BUILD_FEM_NETGEN) + if(WIN32) + INSTALL(TARGETS NETGENPlugin + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ) + else(WIN32) + INSTALL(TARGETS NETGENPlugin + LIBRARY DESTINATION lib + ) + endif(WIN32) +endif (FREECAD_BUILD_FEM_NETGEN)