Skip to content

Commit

Permalink
linux-ready; DDF experiments.
Browse files Browse the repository at this point in the history
  • Loading branch information
ssv committed Jan 29, 2020
1 parent 19b7ba1 commit 81637d8
Show file tree
Hide file tree
Showing 422 changed files with 5,173 additions and 3,915 deletions.
50 changes: 27 additions & 23 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ message (STATUS "Analysis Situs VERSION_PATCH: ${VERSION_PATCH}")
set (3RDPARTY_DIR "" CACHE PATH "The root directory for all 3-rd parties.")

if (NOT DEFINED ${3RDPARTY_DIR} AND ${3RDPARTY_DIR} STREQUAL "")
message (FATAL_ERROR "... root 3rdparty directory was not found.")
message (FATAL_ERROR "... root 3rdparty directory was not found.\nPlease, set 3RDPARTY_DIR variable.")
endif()

# Qt
Expand Down Expand Up @@ -86,7 +86,6 @@ ${3RDPARTY_tk_DLL_DIR};\
${3RDPARTY_freetype_DLL_DIR};\
${3RDPARTY_freeimage_DLL_DIR};\
${3RDPARTY_gl2ps_DLL_DIR};\
${3RDPARTY_tbb_DLL_DIR};\
${3RDPARTY_QT_DIR}/bin;")

set (3RDPARTY_DLL_DEB_PATH "${3RDPARTY_DLL_PATH}")
Expand Down Expand Up @@ -133,7 +132,7 @@ if (MSVC)
add_definitions (/W4)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /EHa")
elseif (CMAKE_COMPILER_IS_GNUCXX)
add_definitions (-Wall -pedantic)
add_definitions (-Wall -pedantic -Wno-unknown-pragmas)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
else()
message ("Unknown compiler")
Expand Down Expand Up @@ -175,8 +174,13 @@ add_subdirectory(${CMAKE_SOURCE_DIR}/src/asiVisu)
add_subdirectory(${CMAKE_SOURCE_DIR}/src/asiEngine)
add_subdirectory(${CMAKE_SOURCE_DIR}/src/asiUI)
add_subdirectory(${CMAKE_SOURCE_DIR}/src/asiTestEngine)
add_subdirectory(${CMAKE_SOURCE_DIR}/src/asiTest)

if (WIN32)
add_subdirectory(${CMAKE_SOURCE_DIR}/src/asiTest)
endif()

add_subdirectory(${CMAKE_SOURCE_DIR}/src/exe)
add_subdirectory(${CMAKE_SOURCE_DIR}/src/cmdDDF)
add_subdirectory(${CMAKE_SOURCE_DIR}/src/cmdEngine)
add_subdirectory(${CMAKE_SOURCE_DIR}/src/cmdMisc)
add_subdirectory(${CMAKE_SOURCE_DIR}/src/cmdRE)
Expand All @@ -193,27 +197,27 @@ endif()
# Folders
#-------------------------------------------------------------------------------

################################################################################
set_property(TARGET asiAlgo PROPERTY FOLDER Framework)
set_property(TARGET asiData PROPERTY FOLDER Framework)
set_property(TARGET asiVisu PROPERTY FOLDER Framework)
set_property(TARGET asiEngine PROPERTY FOLDER Framework)
set_property(TARGET asiUI PROPERTY FOLDER Framework)
set_property(TARGET asiTestEngine PROPERTY FOLDER Framework)
################################################################################
set_property(TARGET asiExe PROPERTY FOLDER Executables)
set_property(TARGET asiTest PROPERTY FOLDER Executables)
################################################################################
set_property(TARGET asiAlgo PROPERTY FOLDER Framework)
set_property(TARGET asiData PROPERTY FOLDER Framework)
set_property(TARGET asiVisu PROPERTY FOLDER Framework)
set_property(TARGET asiEngine PROPERTY FOLDER Framework)
set_property(TARGET asiUI PROPERTY FOLDER Framework)
set_property(TARGET asiTestEngine PROPERTY FOLDER Framework)
set_property(TARGET asiExe PROPERTY FOLDER Executables)

if (WIN32)
set_property(TARGET asiTest PROPERTY FOLDER Executables)
endif()

if (NOT "${INNOSETUP_EXE}" STREQUAL "" AND EXISTS "${INNOSETUP_EXE}")
set_property(TARGET setup PROPERTY FOLDER Utilities)
set_property(TARGET setup PROPERTY FOLDER Utilities)
endif()
################################################################################
set_property(TARGET asiTcl PROPERTY FOLDER Batch)
################################################################################
set_property(TARGET cmdEngine PROPERTY FOLDER Commands)
set_property(TARGET cmdMisc PROPERTY FOLDER Commands)
set_property(TARGET cmdRE PROPERTY FOLDER Commands)
################################################################################

set_property(TARGET asiTcl PROPERTY FOLDER Batch)
set_property(TARGET cmdDDF PROPERTY FOLDER Commands)
set_property(TARGET cmdEngine PROPERTY FOLDER Commands)
set_property(TARGET cmdMisc PROPERTY FOLDER Commands)
set_property(TARGET cmdRE PROPERTY FOLDER Commands)

set_property (GLOBAL PROPERTY USE_FOLDERS ON)

Expand Down
4 changes: 4 additions & 0 deletions asiExe.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
EXEC_PATH=$(dirname "$0")
export LD_LIBRARY_PATH="${EXEC_PATH}/"
eval "${EXEC_PATH}/asiExe $@"
6 changes: 6 additions & 0 deletions cmake/asitus_ActiveData.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,14 @@ message (STATUS "... Active Data Debug Binary dirs: ${3RDPARTY_active_data_DLL_

#--------------------------------------------------------------------------
# Installation
#--------------------------------------------------------------------------

if (WIN32)
install (FILES ${3RDPARTY_active_data_DLL_DIR}/ActiveData.dll DESTINATION bin)
install (FILES ${3RDPARTY_active_data_DLL_DIR}/ActiveDataAPI.dll DESTINATION bin)
install (FILES ${3RDPARTY_active_data_DLL_DIR}/ActiveDataAux.dll DESTINATION bin)
else()
install (FILES ${3RDPARTY_active_data_LIBRARY_DIR}/libActiveData.so DESTINATION bin)
install (FILES ${3RDPARTY_active_data_LIBRARY_DIR}/libActiveDataAPI.so DESTINATION bin)
install (FILES ${3RDPARTY_active_data_LIBRARY_DIR}/libActiveDataAux.so DESTINATION bin)
endif()
8 changes: 8 additions & 0 deletions cmake/asitus_Mobius.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,18 @@ message (STATUS "... Mobius Debug Binary dirs: ${3RDPARTY_mobius_DLL_DIR_DEBUG}

#--------------------------------------------------------------------------
# Installation
#--------------------------------------------------------------------------

if (WIN32)
install (FILES ${3RDPARTY_mobius_DLL_DIR}/mobiusCore.dll DESTINATION bin)
install (FILES ${3RDPARTY_mobius_DLL_DIR}/mobiusBSpl.dll DESTINATION bin)
install (FILES ${3RDPARTY_mobius_DLL_DIR}/mobiusPoly.dll DESTINATION bin)
install (FILES ${3RDPARTY_mobius_DLL_DIR}/mobiusGeom.dll DESTINATION bin)
install (FILES ${3RDPARTY_mobius_DLL_DIR}/mobiusCascade.dll DESTINATION bin)
else()
install (FILES ${3RDPARTY_mobius_LIBRARY_DIR}/libmobiusCore.so DESTINATION bin)
install (FILES ${3RDPARTY_mobius_LIBRARY_DIR}/libmobiusBSpl.so DESTINATION bin)
install (FILES ${3RDPARTY_mobius_LIBRARY_DIR}/libmobiusPoly.so DESTINATION bin)
install (FILES ${3RDPARTY_mobius_LIBRARY_DIR}/libmobiusGeom.so DESTINATION bin)
install (FILES ${3RDPARTY_mobius_LIBRARY_DIR}/libmobiusCascade.so DESTINATION bin)
endif()
105 changes: 105 additions & 0 deletions cmake/asitus_OCCT.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ message (STATUS "... OCCT Debug Binary dirs: ${3RDPARTY_OCCT_DLL_DIR_DEBUG}")

#--------------------------------------------------------------------------
# Installation
#--------------------------------------------------------------------------

if (WIN32)
message (STATUS "... OCCT binaries: ${3RDPARTY_OCCT_DLL_DIR}")

Expand Down Expand Up @@ -62,5 +64,108 @@ if (WIN32)
install (FILES ${3RDPARTY_OCCT_DLL_DIR}/TKHLR.dll DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_DLL_DIR}/TKFillet.dll DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_DLL_DIR}/TKSTL.dll DESTINATION bin)
else()
message (STATUS "... OCCT libraries: ${3RDPARTY_OCCT_LIBRARY_DIR}")

install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKBin.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKBinL.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKBO.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKBool.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKBRep.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKCAF.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKCDF.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKernel.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKG2d.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKG3d.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKGeomAlgo.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKGeomBase.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKIGES.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKLCAF.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKMath.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKMesh.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKOffset.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKPrim.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKShHealing.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKSTEP.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKSTEP209.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKSTEPAttr.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKSTEPBase.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKTopAlgo.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKXSBase.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKHLR.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKFillet.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKSTL.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKXCAF.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKVCAF.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKXDESTEP.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKV3d.so DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKService.so DESTINATION bin)
#
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKBin.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKBinL.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKBO.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKBool.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKBRep.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKCAF.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKCDF.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKernel.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKG2d.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKG3d.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKGeomAlgo.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKGeomBase.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKIGES.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKLCAF.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKMath.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKMesh.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKOffset.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKPrim.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKShHealing.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKSTEP.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKSTEP209.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKSTEPAttr.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKSTEPBase.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKTopAlgo.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKXSBase.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKHLR.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKFillet.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKSTL.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKXCAF.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKVCAF.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKXDESTEP.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKV3d.so.7 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKService.so.7 DESTINATION bin)
#
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKBin.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKBinL.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKBO.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKBool.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKBRep.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKCAF.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKCDF.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKernel.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKG2d.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKG3d.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKGeomAlgo.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKGeomBase.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKIGES.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKLCAF.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKMath.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKMesh.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKOffset.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKPrim.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKShHealing.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKSTEP.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKSTEP209.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKSTEPAttr.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKSTEPBase.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKTopAlgo.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKXSBase.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKHLR.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKFillet.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKSTL.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKXCAF.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKVCAF.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKXDESTEP.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKV3d.so.7.4.1 DESTINATION bin)
install (FILES ${3RDPARTY_OCCT_LIBRARY_DIR}/libTKService.so.7.4.1 DESTINATION bin)
endif()
26 changes: 4 additions & 22 deletions cmake/asitus_OCCT_3rdparty.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,12 @@
ASITUS_THIRDPARTY_PRODUCT("tcl" "" "tcl.h" "tcl86")
if (3RDPARTY_tcl_DIR AND NOT 3RDPARTY_tk_DIR)
if (EXISTS ${3RDPARTY_tcl_INCLUDE_DIR}/tk.h)
set (3RDPARTY_tk_DIR "${3RDPARTY_tcl_DIR}" CACHE PATH "The directory containing tk" FORCE)
endif()
endif()
ASITUS_THIRDPARTY_PRODUCT("tk" "" "tk.h" "tk86")

#ASITUS_THIRDPARTY_PRODUCT("freeimage" "" "FreeImage.h" "FreeImage")
#if (3RDPARTY_freeimage_DIR AND NOT 3RDPARTY_freeimageplus_DIR)
# set (3RDPARTY_freeimageplus_DIR "${3RDPARTY_freeimage_DIR}" CACHE PATH "The directory containing freeimageplus" FORCE)
#endif()

#ASITUS_THIRDPARTY_PRODUCT("freeimageplus" "" "FreeImagePlus.h" "FreeImagePlus")
ASITUS_THIRDPARTY_PRODUCT("freetype" "" "ft2build.h" "freetype")
#ASITUS_THIRDPARTY_PRODUCT("tbb" "tbb" "tbb.h" "tbb")

#--------------------------------------------------------------------------
# Installation
if (WIN32)
#--------------------------------------------------------------------------

# Tcl
if (WIN32)
install (FILES ${3RDPARTY_tcl_DIR}/bin/tcl86.dll DESTINATION bin)
install (FILES ${3RDPARTY_tcl_DIR}/bin/zlib1.dll DESTINATION bin)

# TBB
#install (FILES ${3RDPARTY_tbb_DIR}/bin/intel64/vc12/tbb.dll DESTINATION bin)
#install (FILES ${3RDPARTY_tbb_DIR}/bin/intel64/vc12/tbbmalloc.dll DESTINATION bin)

else()
install (FILES ${3RDPARTY_tcl_DIR}/lib/libtcl8.6.so DESTINATION bin)
endif()
23 changes: 18 additions & 5 deletions cmake/asitus_Qt.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,29 @@ mark_as_advanced (Qt5_DIR)

#--------------------------------------------------------------------------
# Installation
#--------------------------------------------------------------------------

if (WIN32)
message (STATUS "... Qt binaries: ${3RDPARTY_QT_DIR}")
message (STATUS "... Qt libraries: ${3RDPARTY_QT_DIR}")

install (FILES ${3RDPARTY_QT_DIR}/bin/Qt5Core.dll DESTINATION bin)
install (FILES ${3RDPARTY_QT_DIR}/bin/Qt5Gui.dll DESTINATION bin)
install (FILES ${3RDPARTY_QT_DIR}/bin/Qt5Widgets.dll DESTINATION bin)
install (FILES ${3RDPARTY_QT_DIR}/bin/Qt5Svg.dll DESTINATION bin)
install (FILES ${3RDPARTY_QT_DIR}/bin/Qt5Core.dll DESTINATION bin)
install (FILES ${3RDPARTY_QT_DIR}/bin/Qt5Gui.dll DESTINATION bin)
install (FILES ${3RDPARTY_QT_DIR}/bin/Qt5Widgets.dll DESTINATION bin)
install (FILES ${3RDPARTY_QT_DIR}/bin/Qt5Svg.dll DESTINATION bin)

install (DIRECTORY ${3RDPARTY_QT_DIR}/plugins/imageformats/ DESTINATION bin/imageformats/)
install (DIRECTORY ${3RDPARTY_QT_DIR}/plugins/platforms/ DESTINATION bin/platforms/)
install (DIRECTORY ${3RDPARTY_QT_DIR}/qml/Qt/ DESTINATION bin/Qt/)
install (DIRECTORY ${3RDPARTY_QT_DIR}/qml/QtGraphicalEffects/ DESTINATION bin/QtGraphicalEffects/)
else()
message (STATUS "... Qt libraries: ${Qt5_DIR}")

install (FILES ${Qt5_DIR}/../../libQt5Core.so.5.9.5 DESTINATION bin)
install (FILES ${Qt5_DIR}/../../libQt5Gui.so.5.9.5 DESTINATION bin)
install (FILES ${Qt5_DIR}/../../libQt5Widgets.so.5.9.5 DESTINATION bin)
install (FILES ${Qt5_DIR}/../../libQt5Svg.so.5.9.5 DESTINATION bin)

install (DIRECTORY ${Qt5_DIR}/../../qt5/plugins/imageformats DESTINATION bin/imageformats/)
install (DIRECTORY ${Qt5_DIR}/../../qt5/plugins/platforms DESTINATION bin/platforms/)
install (DIRECTORY ${Qt5_DIR}/../../qt5/qml/QtGraphicalEffects DESTINATION bin/QtGraphicalEffects/)
endif()
Loading

0 comments on commit 81637d8

Please sign in to comment.