From fe443ed42df3b33646e053bd8001fd2899624b37 Mon Sep 17 00:00:00 2001 From: dbv Date: Wed, 24 Feb 2016 14:39:07 +0300 Subject: [PATCH] Changed install paths for SALOME module --- CMakeLists.txt | 30 ++- env_Salome.bat | 10 +- env_linux.sh | 10 +- msvc10_env.bat | 195 ------------------ src/Config/CMakeLists.txt | 8 +- src/ConnectorPlugin/CMakeLists.txt | 7 +- src/ConstructionPlugin/CMakeLists.txt | 8 +- src/Events/CMakeLists.txt | 8 +- src/ExchangePlugin/CMakeLists.txt | 4 +- src/FeaturesPlugin/CMakeLists.txt | 4 +- src/GeomAPI/CMakeLists.txt | 10 +- src/GeomAlgoAPI/CMakeLists.txt | 6 +- src/GeomAlgoImpl/CMakeLists.txt | 2 +- src/GeomData/CMakeLists.txt | 8 +- src/GeomDataAPI/CMakeLists.txt | 6 +- src/GeomValidators/CMakeLists.txt | 2 +- src/InitializationPlugin/CMakeLists.txt | 6 +- src/Model/CMakeLists.txt | 8 +- src/ModelAPI/CMakeLists.txt | 8 +- src/ModuleBase/CMakeLists.txt | 11 +- src/ParametersPlugin/CMakeLists.txt | 8 +- src/PartSet/CMakeLists.txt | 19 +- src/PartSetPlugin/CMakeLists.txt | 4 +- src/PythonAPI/CMakeLists.txt | 4 +- src/PythonAddons/CMakeLists.txt | 18 +- src/PythonAddons/addons_Features.xml | 4 - src/PythonAddons/addons_Features.xml.in | 4 + src/SHAPERGUI/CMakeLists.txt | 12 +- src/SketchPlugin/CMakeLists.txt | 4 +- src/SketchSolver/CMakeLists.txt | 2 +- .../PlaneGCSSolver/CMakeLists.txt | 2 +- .../SolveSpaceSolver/CMakeLists.txt | 2 +- src/SketcherPrs/CMakeLists.txt | 4 +- src/XGUI/CMakeLists.txt | 27 ++- 34 files changed, 151 insertions(+), 314 deletions(-) delete mode 100644 msvc10_env.bat delete mode 100644 src/PythonAddons/addons_Features.xml create mode 100644 src/PythonAddons/addons_Features.xml.in diff --git a/CMakeLists.txt b/CMakeLists.txt index a3aaaf287..257524079 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,10 +15,10 @@ INCLUDE(FindSUIT) IF(UNIX) IF(CMAKE_COMPILER_IS_GNUCC) - #C++11 is not supported on some platforms, disable it + #C++11 is not supported on some platforms, disable it MESSAGE(STATUS "Setting -std=c++0x flag for the gcc...") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") - + #Supporting test coverage checks (gcov) in the DEBUG mode IF(USE_TEST_COVERAGE) INCLUDE(CodeCoverage) @@ -26,18 +26,40 @@ IF(UNIX) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage") SET(CMAKE_SHARED_LINKER_FLAGS "-lgcov") - + SETUP_TARGET_FOR_COVERAGE(test_coverage # Name for custom target. ctest # Name of the test driver executable that runs the tests. coverage) # Name of output directory. ENDIF(USE_TEST_COVERAGE) - + #SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -E") MESSAGE(STATUS "gcc flags are: " ${CMAKE_CXX_FLAGS}) MESSAGE(STATUS "linker flags are: " ${CMAKE_SHARED_LINKER_FLAGS}) ENDIF(CMAKE_COMPILER_IS_GNUCC) ENDIF(UNIX) +IF(${HAVE_SALOME}) + SET(SHAPER_INSTALL_ADDONS bin/salome CACHE INTERNAL "" FORCE) + SET(SHAPER_INSTALL_BIN lib/salome CACHE INTERNAL "" FORCE) + SET(SHAPER_INSTALL_PLUGIN_FILES lib/salome CACHE INTERNAL "" FORCE) + SET(SHAPER_INSTALL_PYTHON_API bin/salome CACHE INTERNAL "" FORCE) + SET(SHAPER_INSTALL_PYTHON_FILES bin/salome CACHE INTERNAL "" FORCE) + SET(SHAPER_INSTALL_RESOURCES share/salome/resources/shaper CACHE INTERNAL "" FORCE) + SET(SHAPER_INSTALL_SWIG bin/salome CACHE INTERNAL "" FORCE) + SET(SHAPER_INSTALL_QM_RESOURCES share/salome/resources/shaper CACHE INTERNAL "" FORCE) + SET(SHAPER_INSTALL_XML_RESOURCES share/salome/resources/shaper CACHE INTERNAL "" FORCE) +ELSE(${HAVE_SALOME}) + SET(SHAPER_INSTALL_ADDONS addons CACHE INTERNAL "" FORCE) + SET(SHAPER_INSTALL_BIN bin CACHE INTERNAL "" FORCE) + SET(SHAPER_INSTALL_PLUGIN_FILES plugins CACHE INTERNAL "" FORCE) + SET(SHAPER_INSTALL_PYTHON_API PythonAPI CACHE INTERNAL "" FORCE) + SET(SHAPER_INSTALL_PYTHON_FILES plugins CACHE INTERNAL "" FORCE) + SET(SHAPER_INSTALL_RESOURCES resources CACHE INTERNAL "" FORCE) + SET(SHAPER_INSTALL_SWIG swig CACHE INTERNAL "" FORCE) + SET(SHAPER_INSTALL_QM_RESOURCES bin CACHE INTERNAL "" FORCE) + SET(SHAPER_INSTALL_XML_RESOURCES plugins CACHE INTERNAL "" FORCE) +ENDIF(${HAVE_SALOME}) + #IF(CMAKE_BUILD_TYPE MATCHES Release) ADD_SUBDIRECTORY (doc) #ENDIF(CMAKE_BUILD_TYPE MATCHES Release) diff --git a/env_Salome.bat b/env_Salome.bat index 2a7d7a437..bcb80178b 100644 --- a/env_Salome.bat +++ b/env_Salome.bat @@ -99,10 +99,10 @@ IF "%ARCH%" == "Win64" ( ) ) -@SET SHAPER_CONFIG_FILE=%ROOT_DIR%\install\plugins +@SET SHAPER_CONFIG_FILE=%ROOT_DIR%\install\share\salome\resources\shaper @SET SHAPER_ROOT_DIR=%ROOT_DIR%\install -@SET PATH=%SHAPER_ROOT_DIR%\swig;%SHAPER_ROOT_DIR%\plugins;%SHAPER_ROOT_DIR%\bin;%PATH% -@SET PYTHONPATH=%SHAPER_ROOT_DIR%\swig;%SHAPER_ROOT_DIR%\plugins;%SHAPER_ROOT_DIR%\addons;%SHAPER_ROOT_DIR%\pythonAPI;%PYTHONPATH% +@SET PATH=%SHAPER_ROOT_DIR%\bin\salome;%SHAPER_ROOT_DIR%\lib\salome;%PATH% +@SET PYTHONPATH=%SHAPER_ROOT_DIR%\bin\salome;%SHAPER_ROOT_DIR%\lib\salome;%PYTHONPATH% -@SET LightAppConfig=%%SHAPER_ROOT_DIR%\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui -@SET SHAPERResources=%SHAPER_ROOT_DIR%\resources +@SET LightAppConfig=%SHAPER_ROOT_DIR%\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui +@SET SHAPERResources=%SHAPER_ROOT_DIR%\share\salome\resources\shaper diff --git a/env_linux.sh b/env_linux.sh index 0304d3338..7ef0107d7 100644 --- a/env_linux.sh +++ b/env_linux.sh @@ -52,8 +52,8 @@ export PATH=${CASROOT}:${PATH} ## #------ SHAPER ------ -export PATH=${SHAPER_ROOT_DIR}/bin:${SHAPER_ROOT_DIR}/plugins:${PATH} -export PYTHONPATH=${SHAPER_ROOT_DIR}/swig:${SHAPER_ROOT_DIR}/plugins:${SHAPER_ROOT_DIR}/addons:${SHAPER_ROOT_DIR}/PythonAPI:${PYTHONPATH} -export LD_LIBRARY_PATH=${SHAPER_ROOT_DIR}/bin:${SHAPER_ROOT_DIR}/swig:${SHAPER_ROOT_DIR}/plugins:${LD_LIBRARY_PATH} -export SHAPER_CONFIG_FILE=${SHAPER_ROOT_DIR}/plugins -export SHAPERResources=${SHAPER_ROOT_DIR}/resources +export PATH=${SHAPER_ROOT_DIR}/bin/salome:${SHAPER_ROOT_DIR}/lib/salome:${PATH} +export PYTHONPATH=${SHAPER_ROOT_DIR}//bin/salome:${SHAPER_ROOT_DIR}/lib/salome:${PYTHONPATH} +export LD_LIBRARY_PATH=${SHAPER_ROOT_DIR}/bin/salome:${SHAPER_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH} +export SHAPER_CONFIG_FILE=${SHAPER_ROOT_DIR}/share/salome/resources/shaper +export SHAPERResources=${SHAPER_ROOT_DIR}/share/salome/resources/shaper diff --git a/msvc10_env.bat b/msvc10_env.bat deleted file mode 100644 index 8d8aa6eb8..000000000 --- a/msvc10_env.bat +++ /dev/null @@ -1,195 +0,0 @@ -@echo off - -@REM Load local settings from file localenv.bat that should be located in the root directory -if "%ROOT_DIR%" == "" ( - set ROOT_DIR=%~dp0.. -) -if exist "%ROOT_DIR%\localenv.bat" ( - echo Setting local environment from %ROOT_DIR%\localenv.bat - call "%ROOT_DIR%\localenv.bat" -) else ( - echo Warning: file %ROOT_DIR%\localenv.bat does not exist; using default environment -) - -rem --------------- Configuration -------------- - -rem --------------- Products path -------------- -if "%PDIR%" == "" ( - set PDIR=%ROOT_DIR%\products -) - -rem --------------- cmake 2.8.7 -------------- -if "%CMAKEDIR%" == "" ( - set CMAKEDIR=%PDIR%\cmake-2.8.12.2 -) -set PATH=%CMAKEDIR%\bin;%PATH% - -@REM ------------------------- -@REM CASCADE -@SET CAS_ROOT_DIR=%PDIR%\OCCT-6.9.1 -@SET CASROOT=%CAS_ROOT_DIR% -@REM ------------------------- - -@REM ------------------------- -@REM CASCADE -@SET PATH=%CASROOT%;%CASROOT%\win32\bin%OCC_LIB_PREFIX%;%PATH% -@SET LIB=%CASROOT%\win32\lib%OCC_LIB_PREFIX%;%LIB% -@set CSF_MDTVFontDirectory=%CASROOT%\src\FontMFT -@set CSF_LANGUAGE=us -@set MMGT_CLEAR=1 -@set CSF_EXCEPTION_PROMPT=1 -@set CSF_SHMessage=%CASROOT%\src\SHMessage -@set CSF_MDTVTexturesDirectory=%CASROOT%\src\Textures -@set CSF_XSMessage=%CASROOT%\src\XSMessage -@set CSF_StandardDefaults=%CASROOT%\src\StdResource -@set CSF_PluginDefaults=%CASROOT%\src\StdResource -@set CSF_XCAFDefaults=%CASROOT%\src\StdResource -@set CSF_StandardLiteDefaults=%CASROOT%\src\StdResource -@set CSF_UnitsLexicon=%CASROOT%\src\UnitsAPI\Lexi_Expr.dat -@set CSF_UnitsDefinition=%CASROOT%\src\UnitsAPI\Units.dat -@set CSF_IGESDefaults=%CASROOT%\src\XSTEPResource -@set CSF_STEPDefaults=%CASROOT%\src\XSTEPResource -@set CSF_XmlOcafResource=%CASROOT%\src\XmlOcafResource -@REM ------------------------- - - -@REM ------------------------- -@REM FREEIMAGE (Used by OCCT and Graphviz) -@SET PATH=%PDIR%\freeimage-3.16.0\dll;%PATH% -@REM ------------------------- - -@REM ------------------------- -@REM FTGL (Used by OCCT) -@SET PATH=%PDIR%\ftgl-2.1.3\bin;%PATH% -@REM ------------------------- - -@REM ------------------------- -@REM FREETYPE (Used by OCCT) -@SET FREETYPE_ROOT_DIR=%PDIR%\freetype-2.4.11 -@SET PATH=%FREETYPE_ROOT_DIR%\bin;%PATH% -@REM ------------------------- -@REM ------------------------- - -@REM ------------------------- -@REM GL2PS (Used by OCCT AND PARAVIEW) -@SET PATH=%PDIR%\gl2ps-1.3.8\bin;%PATH% -@REM ------------------------- - -@REM ------------------------- -@REM TBB (Used by OCCT) -@SET PATH=%PDIR%\tbb-4.2.4\bin;%PATH% -@REM ------------------------- - -@REM ------------------------- -@REM QT -@SET QTDIR=%PDIR%\qt-4.8.4 -@ECHO -- Creating qt.conf... in %QTDIR% -@ECHO [Paths] > %QTDIR%/bin/qt.conf -@ECHO Prefix = %QTDIR:\=/% >> %QTDIR%/bin/qt.conf -@SET PATH=%QTDIR%\bin;%PATH% - -@REM ------------------------- - -@REM ------------------------- -@REM PYTHON -@SET PYTHONHOME=%PDIR%\python-2.7.10 -@SET PYTHON_INCLUDE=%PYTHONHOME%\include -@SET PATH=%PYTHONHOME%;%PYTHONHOME%\libs;%PATH% -@SET PYTHONPATH=%PYTHONHOME%\Lib;%PYTHONPATH% -@SET PYTHONPATH=%PYTHONHOME%\DLLs;%PYTHONPATH% -@SET PYTHON_VERSION=2.7 -@REM ------------------------- - -@REM ------------------------- -@REM ZLIB (for LIBXML2) -@SET PATH=%PDIR%\zlib-1.2.5\dll;%PATH% -@REM ------------------------- - -@REM ------------------------- -@REM LIBXML2 -@SET LIBXML2_ROOT_DIR=%PDIR%\libxml2-2.9.0 -@SET PATH=%LIBXML2_ROOT_DIR%\lib;%PATH% -@SET PATH=%LIBXML2_ROOT_DIR%\bin;%PATH% -@REM ------------------------- - -@REM ------------------------- -@REM SWIG -@SET PATH=%PDIR%\swig-2.0.9\bin;%PATH% -@REM ------------------------- - -@REM ------------------------- -@SET SOLVESPACE_ROOT_DIR=%PDIR%\solvespace-2.1 -@SET PATH=%SOLVESPACE_ROOT_DIR%\lib;%PATH% -@SET _NO_DEBUG_HEAP=1 -@REM ------------------------- - -@REM ------------------------- -@SET PLANEGCS_ROOT_DIR=%PDIR%\planegcs-0.16 -@SET PATH=%PLANEGCS_ROOT_DIR%\lib;%PATH% -@REM ------------------------- - -@REM ------------------------- -@SET EIGEN_ROOT_DIR=%PDIR%\eigen-3.2.7 -@REM ------------------------- - -@REM ------------------------- -@IF "%SALOME_ROOT_DIR%" == "" ( -@SET BOOST_ROOT_DIR=%PDIR%\boost-1.52.0 -) ELSE ( -@SET BOOST_ROOT_DIR=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\boost-1.52.0 -) -@REM ------------------------- - -@REM ------------------------- -@REM PTHREAD -@SET PATH=%PDIR%\pthreads-2.9.1\lib;%PATH% -@REM ------------------------- - -@REM ------------------------- -@REM DOXYGEN -@SET DOXYGEN_ROOT_DIR=%PDIR%\doxygen-1.8.3.1 -@SET PATH=%DOXYGEN_ROOT_DIR%\bin;%PATH% -@REM ------------------------- - -@REM ------------------------- -@REM GRAPHVIZ -@SET GRAPHVIZ_ROOT_DIR=%PDIR%\graphviz-2.38.0 -@SET GRAPHVIZHOME=%GRAPHVIZ_ROOT_DIR% -@SET PATH=%GRAPHVIZ_ROOT_DIR%\bin;%PATH% -@REM ------------------------- - -@REM ------------------------- -@REM PNG library (Used by GRAPHVIZ) -@SET PATH=%PDIR%\libpng-1.5.10\bin;%PATH% -@REM ------------------------- - - -@REM ------------------------- -@REM SUIT -@SET SUIT_DIR=%PDIR%\suit -@SET PATH=%SUIT_DIR%\bin;%PATH% -@REM ------------------------- - -@REM ------------------------- -@REM OPENPARTS -@SET SHAPER_ROOT_DIR=%ROOT_DIR%\install -@SET SHAPER_CONFIG_FILE=%SHAPER_ROOT_DIR%\plugins -@SET PATH=%SHAPER_ROOT_DIR%\swig;%SHAPER_ROOT_DIR%\plugins;%SHAPER_ROOT_DIR%\bin;%PATH% -@SET PYTHONPATH=%SHAPER_ROOT_DIR%\swig;%SHAPER_ROOT_DIR%\plugins;%SHAPER_ROOT_DIR%\addons;%SHAPER_ROOT_DIR%\pythonAPI;%PYTHONPATH% -@SET SHAPERResources=%SHAPER_ROOT_DIR%\resources - -rem -------- Visual Studio -------------------- -rem Detect Visual Studio (either commercial or Express edition) -if "%VS100COMNTOOLS%" == "" ( - echo Could not find MS Visual Studio: variable VS100COMNTOOLS is not defined! - exit 1 -) else if exist "%VS100COMNTOOLS%\..\IDE\devenv.exe" ( - set MSVC_EXE="%VS100COMNTOOLS%\..\IDE\devenv.exe" -) else if exist "%VS100COMNTOOLS%\..\IDE\VCExpress.exe" ( - set MSVC_EXE="%VS100COMNTOOLS%\..\IDE\VCExpress.exe" -) else ( - echo "Could not find MS Visual Studio in %VS100COMNTOOLS%\..\IDE" - echo Check environment variable VS100COMNTOOLS! - exit 1 -) -call "%VS100COMNTOOLS%..\Tools\vsvars32.bat" diff --git a/src/Config/CMakeLists.txt b/src/Config/CMakeLists.txt index 75cb09703..8952f1756 100644 --- a/src/Config/CMakeLists.txt +++ b/src/Config/CMakeLists.txt @@ -82,9 +82,9 @@ ENDFOREACH() # check default solver in the list of solvers LIST(FIND SOLVERS ${DEFAULT_SOLVER} INDEX) IF(${INDEX} GREATER -1) - MESSAGE(STATUS "Default solver: ${DEFAULT_SOLVER}") + MESSAGE(STATUS "Default solver: ${DEFAULT_SOLVER}") ELSE() - MESSAGE(FATAL_ERROR "Default solver: ${DEFAULT_SOLVER} is switched off.\nUnset NO_${DEFAULT_SOLVER} variable or define another default solver DEFAULT_SOLVER= from the list: ${SOLVERS}.") + MESSAGE(FATAL_ERROR "Default solver: ${DEFAULT_SOLVER} is switched off.\nUnset NO_${DEFAULT_SOLVER} variable or define another default solver DEFAULT_SOLVER= from the list: ${SOLVERS}.") ENDIF() # prepare variables for configuration @@ -102,5 +102,5 @@ CONFIGURE_FILE( "${CMAKE_CURRENT_BINARY_DIR}/plugins.xml" ) -INSTALL(TARGETS Config DESTINATION bin) -INSTALL(FILES ${XML_RESOURCES} DESTINATION plugins) +INSTALL(TARGETS Config DESTINATION ${SHAPER_INSTALL_BIN}) +INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) diff --git a/src/ConnectorPlugin/CMakeLists.txt b/src/ConnectorPlugin/CMakeLists.txt index 9aafdea5a..cc988831e 100644 --- a/src/ConnectorPlugin/CMakeLists.txt +++ b/src/ConnectorPlugin/CMakeLists.txt @@ -5,10 +5,11 @@ SET(PYTHON_FILES ConnectorPlugin_ExportFeature.py ) -SET(XML_RESSOURCES +SET(XML_RESOURCES plugin-Connector.xml ) -ADD_CUSTOM_TARGET(ConnectorPlugin SOURCES ${PYTHON_FILES} ${XML_RESSOURCES}) +ADD_CUSTOM_TARGET(ConnectorPlugin SOURCES ${PYTHON_FILES} ${XML_RESOURCES}) -INSTALL(FILES ${PYTHON_FILES} ${XML_RESSOURCES} DESTINATION plugins) +INSTALL(FILES ${PYTHON_FILES} DESTINATION ${SHAPER_INSTALL_PYTHON_FILES}) +INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) diff --git a/src/ConstructionPlugin/CMakeLists.txt b/src/ConstructionPlugin/CMakeLists.txt index 8633f1f7b..2d379a45d 100644 --- a/src/ConstructionPlugin/CMakeLists.txt +++ b/src/ConstructionPlugin/CMakeLists.txt @@ -27,8 +27,8 @@ SET(XML_RESOURCES SET(PROJECT_LIBRARIES Config - ModelAPI - GeomAPI + ModelAPI + GeomAPI GeomAlgoAPI ) @@ -36,8 +36,8 @@ ADD_DEFINITIONS(-DCONSTRUCTIONPLUGIN_EXPORTS) ADD_LIBRARY(ConstructionPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES}) TARGET_LINK_LIBRARIES(ConstructionPlugin ${PROJECT_LIBRARIES}) -INSTALL(TARGETS ConstructionPlugin DESTINATION plugins) -INSTALL(FILES ${XML_RESOURCES} DESTINATION plugins) +INSTALL(TARGETS ConstructionPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) +INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) INCLUDE_DIRECTORIES( ../Config diff --git a/src/Events/CMakeLists.txt b/src/Events/CMakeLists.txt index c9cb2beb0..5c5d99a08 100644 --- a/src/Events/CMakeLists.txt +++ b/src/Events/CMakeLists.txt @@ -8,7 +8,7 @@ INCLUDE(${SWIG_USE_FILE}) SET(PROJECT_HEADERS Events.h Events_Message.h - Events_MessageGroup.h + Events_MessageGroup.h Events_Listener.h Events_Loop.h Events_Error.h @@ -53,6 +53,6 @@ IF(WIN32) SET_TARGET_PROPERTIES(_EventsAPI PROPERTIES DEBUG_OUTPUT_NAME _EventsAPI_d) ENDIF(WIN32) -INSTALL(TARGETS Events DESTINATION bin) -INSTALL(TARGETS _EventsAPI DESTINATION swig) -INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION swig) +INSTALL(TARGETS Events DESTINATION ${SHAPER_INSTALL_BIN}) +INSTALL(TARGETS _EventsAPI DESTINATION ${SHAPER_INSTALL_SWIG}) +INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION ${SHAPER_INSTALL_SWIG}) diff --git a/src/ExchangePlugin/CMakeLists.txt b/src/ExchangePlugin/CMakeLists.txt index 99041c961..73d251f10 100644 --- a/src/ExchangePlugin/CMakeLists.txt +++ b/src/ExchangePlugin/CMakeLists.txt @@ -44,8 +44,8 @@ ADD_LIBRARY(ExchangePlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RE TARGET_LINK_LIBRARIES(ExchangePlugin ${PROJECT_LIBRARIES}) -INSTALL(TARGETS ExchangePlugin DESTINATION plugins) -INSTALL(FILES ${XML_RESOURCES} DESTINATION plugins) +INSTALL(TARGETS ExchangePlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) +INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) ADD_UNIT_TESTS(TestImport.py TestExport.py) diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt index bdce2cafb..8dea5b736 100644 --- a/src/FeaturesPlugin/CMakeLists.txt +++ b/src/FeaturesPlugin/CMakeLists.txt @@ -89,8 +89,8 @@ ADD_DEFINITIONS(-DFEATURESPLUGIN_EXPORTS) ADD_LIBRARY(FeaturesPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES}) TARGET_LINK_LIBRARIES(FeaturesPlugin ${PROJECT_LIBRARIES}) -INSTALL(TARGETS FeaturesPlugin DESTINATION plugins) -INSTALL(FILES ${XML_RESOURCES} DESTINATION plugins) +INSTALL(TARGETS FeaturesPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) +INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) ADD_UNIT_TESTS(TestExtrusion.py TestExtrusionSketch.py diff --git a/src/GeomAPI/CMakeLists.txt b/src/GeomAPI/CMakeLists.txt index b258cb54a..6c1307203 100644 --- a/src/GeomAPI/CMakeLists.txt +++ b/src/GeomAPI/CMakeLists.txt @@ -69,8 +69,8 @@ SET(PROJECT_SOURCES ) SET(PROJECT_LIBRARIES - ${CAS_KERNEL} - ${CAS_MODELER} + ${CAS_KERNEL} + ${CAS_MODELER} ${CAS_VIEWER} ${CAS_SHAPE} ${CAS_TKTopAlgo} @@ -106,6 +106,6 @@ IF(WIN32) SET_TARGET_PROPERTIES(_GeomAPI PROPERTIES DEBUG_OUTPUT_NAME _GeomAPI_d) ENDIF(WIN32) -INSTALL(TARGETS _GeomAPI DESTINATION swig) -INSTALL(TARGETS GeomAPI DESTINATION bin) -INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION swig) +INSTALL(TARGETS _GeomAPI DESTINATION ${SHAPER_INSTALL_SWIG}) +INSTALL(TARGETS GeomAPI DESTINATION ${SHAPER_INSTALL_BIN}) +INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION ${SHAPER_INSTALL_SWIG}) diff --git a/src/GeomAlgoAPI/CMakeLists.txt b/src/GeomAlgoAPI/CMakeLists.txt index 5ad6028f1..1b3390b16 100644 --- a/src/GeomAlgoAPI/CMakeLists.txt +++ b/src/GeomAlgoAPI/CMakeLists.txt @@ -124,6 +124,6 @@ IF(WIN32) SET_TARGET_PROPERTIES(_GeomAlgoAPI PROPERTIES DEBUG_OUTPUT_NAME _GeomAlgoAPI_d) ENDIF(WIN32) -INSTALL(TARGETS _GeomAlgoAPI DESTINATION swig) -INSTALL(TARGETS GeomAlgoAPI DESTINATION bin) -INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION swig) +INSTALL(TARGETS _GeomAlgoAPI DESTINATION ${SHAPER_INSTALL_SWIG}) +INSTALL(TARGETS GeomAlgoAPI DESTINATION ${SHAPER_INSTALL_BIN}) +INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION ${SHAPER_INSTALL_SWIG}) diff --git a/src/GeomAlgoImpl/CMakeLists.txt b/src/GeomAlgoImpl/CMakeLists.txt index 02de4b1a1..b38a05539 100644 --- a/src/GeomAlgoImpl/CMakeLists.txt +++ b/src/GeomAlgoImpl/CMakeLists.txt @@ -27,4 +27,4 @@ INCLUDE_DIRECTORIES( TARGET_LINK_LIBRARIES(GeomAlgoImpl ${PROJECT_LIBRARIES}) -INSTALL(TARGETS GeomAlgoImpl DESTINATION bin) +INSTALL(TARGETS GeomAlgoImpl DESTINATION ${SHAPER_INSTALL_BIN}) diff --git a/src/GeomData/CMakeLists.txt b/src/GeomData/CMakeLists.txt index 16a1329d7..7aedcdb7d 100644 --- a/src/GeomData/CMakeLists.txt +++ b/src/GeomData/CMakeLists.txt @@ -17,10 +17,10 @@ SET(PROJECT_SOURCES SET(PROJECT_LIBRARIES GeomDataAPI - ModelAPI - GeomAPI + ModelAPI + GeomAPI Events - ${CAS_OCAF} + ${CAS_OCAF} ${CAS_SHAPE} ) @@ -38,4 +38,4 @@ INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ) -INSTALL(TARGETS GeomData DESTINATION bin) +INSTALL(TARGETS GeomData DESTINATION ${SHAPER_INSTALL_BIN}) diff --git a/src/GeomDataAPI/CMakeLists.txt b/src/GeomDataAPI/CMakeLists.txt index bef8c896d..2d4534ea6 100644 --- a/src/GeomDataAPI/CMakeLists.txt +++ b/src/GeomDataAPI/CMakeLists.txt @@ -53,8 +53,8 @@ IF(WIN32) SET_TARGET_PROPERTIES(_GeomDataAPI PROPERTIES DEBUG_OUTPUT_NAME _GeomDataAPI_d) ENDIF(WIN32) -INSTALL(TARGETS GeomDataAPI DESTINATION bin) -INSTALL(TARGETS _GeomDataAPI DESTINATION swig) -INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION swig) +INSTALL(TARGETS GeomDataAPI DESTINATION ${SHAPER_INSTALL_BIN}) +INSTALL(TARGETS _GeomDataAPI DESTINATION ${SHAPER_INSTALL_SWIG}) +INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION ${SHAPER_INSTALL_SWIG}) ADD_UNIT_TESTS(TestConstants.py) diff --git a/src/GeomValidators/CMakeLists.txt b/src/GeomValidators/CMakeLists.txt index b18ae35aa..af20eedc4 100644 --- a/src/GeomValidators/CMakeLists.txt +++ b/src/GeomValidators/CMakeLists.txt @@ -57,4 +57,4 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/src/GeomDataAPI ) -INSTALL(TARGETS GeomValidators DESTINATION plugins) +INSTALL(TARGETS GeomValidators DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) diff --git a/src/InitializationPlugin/CMakeLists.txt b/src/InitializationPlugin/CMakeLists.txt index 9f18bb661..7967fcc67 100644 --- a/src/InitializationPlugin/CMakeLists.txt +++ b/src/InitializationPlugin/CMakeLists.txt @@ -5,14 +5,14 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/Events ${PROJECT_SOURCE_DIR}/src/Config ${PROJECT_SOURCE_DIR}/src/ModelAPI ${PROJECT_SOURCE_DIR}/src/GeomAPI -) +) SET(PROJECT_HEADERS InitializationPlugin.h InitializationPlugin_Plugin.h #InitializationPlugin_OriginPlanesFeature.h ) - + SET(PROJECT_SOURCES InitializationPlugin_Plugin.cpp #InitializationPlugin_OriginPlanesFeature.cpp @@ -32,5 +32,5 @@ ADD_LIBRARY(InitializationPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${ TARGET_LINK_LIBRARIES(InitializationPlugin ${PROJECT_LIBRARIES}) -INSTALL(TARGETS InitializationPlugin DESTINATION plugins) +INSTALL(TARGETS InitializationPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) #INSTALL(FILES ${XML_RESOURCES} DESTINATION plugins) diff --git a/src/Model/CMakeLists.txt b/src/Model/CMakeLists.txt index 2ebf396ea..11d98c427 100644 --- a/src/Model/CMakeLists.txt +++ b/src/Model/CMakeLists.txt @@ -72,9 +72,9 @@ SET(PROJECT_SOURCES ) SET(PROJECT_LIBRARIES - ModelAPI - Events - Config + ModelAPI + Events + Config GeomData GeomAPI GeomAlgoAPI @@ -101,4 +101,4 @@ INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ) -INSTALL(TARGETS Model DESTINATION bin) +INSTALL(TARGETS Model DESTINATION ${SHAPER_INSTALL_BIN}) diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt index 696f724c2..fb4db8b55 100644 --- a/src/ModelAPI/CMakeLists.txt +++ b/src/ModelAPI/CMakeLists.txt @@ -90,7 +90,7 @@ ADD_LIBRARY(ModelAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS}) SET_TARGET_PROPERTIES(ModelAPI PROPERTIES LINKER_LANGUAGE CXX) TARGET_LINK_LIBRARIES(ModelAPI ${PROJECT_LIBRARIES}) -INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/Config +INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/Config ${PROJECT_SOURCE_DIR}/src/Events ${PROJECT_SOURCE_DIR}/src/GeomAPI ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI @@ -120,9 +120,9 @@ IF(WIN32) SET_TARGET_PROPERTIES(_ModelAPI PROPERTIES DEBUG_OUTPUT_NAME _ModelAPI_d) ENDIF(WIN32) -INSTALL(TARGETS _ModelAPI DESTINATION swig) -INSTALL(TARGETS ModelAPI DESTINATION bin) -INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION swig) +INSTALL(TARGETS _ModelAPI DESTINATION ${SHAPER_INSTALL_SWIG}) +INSTALL(TARGETS ModelAPI DESTINATION ${SHAPER_INSTALL_BIN}) +INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION ${SHAPER_INSTALL_SWIG}) ADD_UNIT_TESTS(TestConstants.py TestUndoRedo.py diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt index d16badfc7..23c589611 100644 --- a/src/ModuleBase/CMakeLists.txt +++ b/src/ModuleBase/CMakeLists.txt @@ -24,11 +24,11 @@ SET(PROJECT_HEADERS ModuleBase_ModelWidget.h ModuleBase_Operation.h ModuleBase_OperationAction.h - ModuleBase_OperationDescription.h + ModuleBase_OperationDescription.h ModuleBase_OperationFeature.h ModuleBase_PageBase.h ModuleBase_PageGroupBox.h - ModuleBase_PageWidget.h + ModuleBase_PageWidget.h ModuleBase_PagedContainer.h ModuleBase_ParamIntSpinBox.h ModuleBase_ParamSpinBox.h @@ -80,7 +80,7 @@ SET(PROJECT_SOURCES ModuleBase_ModelWidget.cpp ModuleBase_Operation.cpp ModuleBase_OperationAction.cpp - ModuleBase_OperationDescription.cpp + ModuleBase_OperationDescription.cpp ModuleBase_OperationFeature.cpp ModuleBase_PageBase.cpp ModuleBase_PageGroupBox.cpp @@ -133,7 +133,7 @@ SET(PROJECT_LIBRARIES ${ViewerData} ) -SET(PROJECT_AUTOMOC +SET(PROJECT_AUTOMOC ${CMAKE_CURRENT_BINARY_DIR}/ModuleBase_automoc.cpp ) @@ -158,5 +158,4 @@ ADD_DEFINITIONS(-DMODULEBASE_EXPORTS ${CAS_DEFINITIONS}) ADD_LIBRARY(ModuleBase SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS}) TARGET_LINK_LIBRARIES(ModuleBase GeomAPI ${PROJECT_LIBRARIES}) -INSTALL(TARGETS ModuleBase DESTINATION bin) - +INSTALL(TARGETS ModuleBase DESTINATION ${SHAPER_INSTALL_BIN}) diff --git a/src/ParametersPlugin/CMakeLists.txt b/src/ParametersPlugin/CMakeLists.txt index 39dd4aca9..b2683044d 100644 --- a/src/ParametersPlugin/CMakeLists.txt +++ b/src/ParametersPlugin/CMakeLists.txt @@ -10,7 +10,7 @@ SET(PROJECT_HEADERS ParametersPlugin_Validators.h ParametersPlugin_EvalListener.h ) - + SET(PROJECT_SOURCES ParametersPlugin_Plugin.cpp ParametersPlugin_Parameter.cpp @@ -30,7 +30,7 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/Events ${PROJECT_SOURCE_DIR}/src/GeomDataAPI ${SUIT_INCLUDE} ${PYTHON_INCLUDE_DIR} -) +) MESSAGE(STATUS "PYTHON_LIBRARIES (ParametersPlugin): ${PYTHON_LIBRARIES}") @@ -47,8 +47,8 @@ ADD_LIBRARY(ParametersPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_ TARGET_LINK_LIBRARIES(ParametersPlugin ${PROJECT_LIBRARIES}) -INSTALL(TARGETS ParametersPlugin DESTINATION plugins) -INSTALL(FILES ${XML_RESOURCES} DESTINATION plugins) +INSTALL(TARGETS ParametersPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) +INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) ADD_UNIT_TESTS(TestParameterCreation.py TestParameterRename.py diff --git a/src/PartSet/CMakeLists.txt b/src/PartSet/CMakeLists.txt index b8c6121cd..2c0d2ed8f 100644 --- a/src/PartSet/CMakeLists.txt +++ b/src/PartSet/CMakeLists.txt @@ -57,7 +57,7 @@ SET(PROJECT_SOURCES PartSet_IconFactory.cpp ) -SET(PROJECT_RESOURCES +SET(PROJECT_RESOURCES PartSet_icons.qrc ) @@ -76,13 +76,13 @@ SET(PROJECT_LIBRARIES ${CAS_SHAPE} ) -SET(PROJECT_AUTOMOC +SET(PROJECT_AUTOMOC ${CMAKE_CURRENT_BINARY_DIR}/PartSet_automoc.cpp ) QT4_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES}) #QT4_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES}) -#QT4_CREATE_TRANSLATION(QM_RESOURCES +#QT4_CREATE_TRANSLATION(QM_RESOURCES # ${PROJECT_SOURCES} # ${TEXT_RESOURCES} # OPTIONS -extensions cpp -no-recursive @@ -115,11 +115,11 @@ IF(NOT ${HAVE_SALOME}) ENDIF(NOT ${HAVE_SALOME}) ADD_DEFINITIONS(-DPARTSET_EXPORTS ${CAS_DEFINITIONS}) -ADD_LIBRARY(PartSet SHARED - ${PROJECT_SOURCES} - ${PROJECT_HEADERS} - ${PROJECT_COMPILED_RESOURCES} -# ${TEXT_RESOURCES} +ADD_LIBRARY(PartSet SHARED + ${PROJECT_SOURCES} + ${PROJECT_HEADERS} + ${PROJECT_COMPILED_RESOURCES} +# ${TEXT_RESOURCES} # ${QM_RESOURCES} ) @@ -128,6 +128,5 @@ TARGET_LINK_LIBRARIES(PartSet ${PROJECT_LIBRARIES} XGUI ModelAPI GeomAlgoAPI) ADD_DEPENDENCIES(PartSet ModuleBase) -INSTALL(TARGETS PartSet DESTINATION bin) +INSTALL(TARGETS PartSet DESTINATION ${SHAPER_INSTALL_BIN}) #INSTALL(FILES ${QM_RESOURCES} DESTINATION bin) - diff --git a/src/PartSetPlugin/CMakeLists.txt b/src/PartSetPlugin/CMakeLists.txt index cd3dcad94..c644b807b 100644 --- a/src/PartSetPlugin/CMakeLists.txt +++ b/src/PartSetPlugin/CMakeLists.txt @@ -31,5 +31,5 @@ INCLUDE_DIRECTORIES( ../GeomAPI ) -INSTALL(TARGETS PartSetPlugin DESTINATION plugins) -INSTALL(FILES ${XML_RESOURCES} DESTINATION plugins) +INSTALL(TARGETS PartSetPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) +INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) diff --git a/src/PythonAPI/CMakeLists.txt b/src/PythonAPI/CMakeLists.txt index 33337d6e3..909e9bdfb 100644 --- a/src/PythonAPI/CMakeLists.txt +++ b/src/PythonAPI/CMakeLists.txt @@ -3,8 +3,8 @@ SET(CMAKE_AUTOMOC ON) -INSTALL(DIRECTORY extension geom model examples DESTINATION PythonAPI) -INSTALL(FILES shaper.py DESTINATION PythonAPI) +INSTALL(DIRECTORY extension geom model examples DESTINATION ${SHAPER_INSTALL_PYTHON_API}) +INSTALL(FILES shaper.py DESTINATION ${SHAPER_INSTALL_PYTHON_API}) # --------- Unit tests ----------- INCLUDE(UnitTest) diff --git a/src/PythonAddons/CMakeLists.txt b/src/PythonAddons/CMakeLists.txt index 37f3efc05..881c75c85 100644 --- a/src/PythonAddons/CMakeLists.txt +++ b/src/PythonAddons/CMakeLists.txt @@ -3,8 +3,20 @@ SET(CMAKE_AUTOMOC ON) -INSTALL(FILES addons_Features.py addons_Features.xml DESTINATION plugins) +# configuration +IF(${HAVE_SALOME}) + SET(ADDONS_FOLDER_PATH ../../../../bin/salome) +ELSE(${HAVE_SALOME}) + SET(ADDONS_FOLDER_PATH ../addons) +ENDIF(${HAVE_SALOME}) +CONFIGURE_FILE( + "${CMAKE_CURRENT_SOURCE_DIR}/addons_Features.xml.in" + "${CMAKE_CURRENT_BINARY_DIR}/addons_Features.xml" + ) -INSTALL(FILES __init__.py DESTINATION addons) -INSTALL(DIRECTORY macros DESTINATION addons) +INSTALL(FILES addons_Features.py DESTINATION ${SHAPER_INSTALL_ADDONS}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/addons_Features.xml DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) + +INSTALL(FILES __init__.py DESTINATION ${SHAPER_INSTALL_ADDONS}) +INSTALL(DIRECTORY macros DESTINATION ${SHAPER_INSTALL_ADDONS}) diff --git a/src/PythonAddons/addons_Features.xml b/src/PythonAddons/addons_Features.xml deleted file mode 100644 index 97ffbd109..000000000 --- a/src/PythonAddons/addons_Features.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/PythonAddons/addons_Features.xml.in b/src/PythonAddons/addons_Features.xml.in new file mode 100644 index 000000000..68b168192 --- /dev/null +++ b/src/PythonAddons/addons_Features.xml.in @@ -0,0 +1,4 @@ + + + + diff --git a/src/SHAPERGUI/CMakeLists.txt b/src/SHAPERGUI/CMakeLists.txt index e21ab2206..a70ef0845 100644 --- a/src/SHAPERGUI/CMakeLists.txt +++ b/src/SHAPERGUI/CMakeLists.txt @@ -12,7 +12,7 @@ SET(PROJECT_HEADERS SHAPERGUI_NestedButton.h ) -SET(PROJECT_AUTOMOC +SET(PROJECT_AUTOMOC ${CMAKE_CURRENT_BINARY_DIR}/SHAPERGUI_automoc.cpp ) @@ -58,9 +58,9 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/XGUI ${CAS_INCLUDE_DIRS} ) -ADD_LIBRARY(SHAPER SHARED - ${PROJECT_SOURCES} - ${PROJECT_HEADERS} +ADD_LIBRARY(SHAPER SHARED + ${PROJECT_SOURCES} + ${PROJECT_HEADERS} ) ADD_DEPENDENCIES(SHAPER XGUI) @@ -68,5 +68,5 @@ ADD_DEPENDENCIES(SHAPER XGUI) # The Qt5Widgets_LIBRARIES variable also includes QtGui and QtCore TARGET_LINK_LIBRARIES(SHAPER ${PROJECT_LIBRARIES}) -INSTALL(TARGETS SHAPER DESTINATION bin) -INSTALL(FILES ${PROJECT_RESOURCES} DESTINATION share/salome/resources/shaper ) +INSTALL(TARGETS SHAPER DESTINATION ${SHAPER_INSTALL_BIN}) +INSTALL(FILES ${PROJECT_RESOURCES} DESTINATION ${SHAPER_INSTALL_RESOURCES}) diff --git a/src/SketchPlugin/CMakeLists.txt b/src/SketchPlugin/CMakeLists.txt index ecb1cb269..0f54cd5e3 100644 --- a/src/SketchPlugin/CMakeLists.txt +++ b/src/SketchPlugin/CMakeLists.txt @@ -101,8 +101,8 @@ INCLUDE_DIRECTORIES( ../SketcherPrs ) -INSTALL(TARGETS SketchPlugin DESTINATION plugins) -INSTALL(FILES ${XML_RESOURCES} DESTINATION plugins) +INSTALL(TARGETS SketchPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) +INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) ADD_UNIT_TESTS(TestSketchPointLine.py TestSketchArcCircle.py diff --git a/src/SketchSolver/CMakeLists.txt b/src/SketchSolver/CMakeLists.txt index 8e18f16da..e8ebc506c 100644 --- a/src/SketchSolver/CMakeLists.txt +++ b/src/SketchSolver/CMakeLists.txt @@ -75,7 +75,7 @@ ADD_LIBRARY(SketchSolver SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} TARGET_LINK_LIBRARIES(SketchSolver ${PROJECT_LIBRARIES} ) -INSTALL(TARGETS SketchSolver DESTINATION plugins) +INSTALL(TARGETS SketchSolver DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) # Include specific solvers diff --git a/src/SketchSolver/PlaneGCSSolver/CMakeLists.txt b/src/SketchSolver/PlaneGCSSolver/CMakeLists.txt index 73c890e23..5d3647429 100644 --- a/src/SketchSolver/PlaneGCSSolver/CMakeLists.txt +++ b/src/SketchSolver/PlaneGCSSolver/CMakeLists.txt @@ -48,4 +48,4 @@ INCLUDE_DIRECTORIES( ADD_LIBRARY(PlaneGCSSolver MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS}) TARGET_LINK_LIBRARIES(PlaneGCSSolver ${PROJECT_LIBRARIES}) -INSTALL(TARGETS PlaneGCSSolver DESTINATION plugins) +INSTALL(TARGETS PlaneGCSSolver DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) diff --git a/src/SketchSolver/SolveSpaceSolver/CMakeLists.txt b/src/SketchSolver/SolveSpaceSolver/CMakeLists.txt index cda6e3bc1..af555779a 100644 --- a/src/SketchSolver/SolveSpaceSolver/CMakeLists.txt +++ b/src/SketchSolver/SolveSpaceSolver/CMakeLists.txt @@ -39,4 +39,4 @@ INCLUDE_DIRECTORIES( ADD_LIBRARY(SolveSpaceSolver MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS}) TARGET_LINK_LIBRARIES(SolveSpaceSolver ${PROJECT_LIBRARIES}) -INSTALL(TARGETS SolveSpaceSolver DESTINATION plugins) +INSTALL(TARGETS SolveSpaceSolver DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) diff --git a/src/SketcherPrs/CMakeLists.txt b/src/SketcherPrs/CMakeLists.txt index 148f332ad..e988b9a84 100644 --- a/src/SketcherPrs/CMakeLists.txt +++ b/src/SketcherPrs/CMakeLists.txt @@ -97,5 +97,5 @@ INCLUDE_DIRECTORIES( TARGET_LINK_LIBRARIES(SketcherPrs ${PROJECT_LIBRARIES}) -INSTALL(TARGETS SketcherPrs DESTINATION bin) -INSTALL(FILES ${PROJECT_PICTURES} DESTINATION resources) \ No newline at end of file +INSTALL(TARGETS SketcherPrs DESTINATION ${SHAPER_INSTALL_BIN}) +INSTALL(FILES ${PROJECT_PICTURES} DESTINATION ${SHAPER_INSTALL_RESOURCES}) diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt index bebf1a79c..bc850e69a 100644 --- a/src/XGUI/CMakeLists.txt +++ b/src/XGUI/CMakeLists.txt @@ -28,7 +28,7 @@ SET(PROJECT_HEADERS XGUI_WorkshopListener.h ) -SET(PROJECT_AUTOMOC +SET(PROJECT_AUTOMOC ${CMAKE_CURRENT_BINARY_DIR}/XGUI_automoc.cpp ) @@ -56,7 +56,7 @@ SET(PROJECT_SOURCES XGUI_WorkshopListener.cpp ) -SET(PROJECT_RESOURCES +SET(PROJECT_RESOURCES XGUI_pictures.qrc ) @@ -89,7 +89,7 @@ IF(NOT ${HAVE_SALOME}) ENDIF(NOT ${HAVE_SALOME}) -IF(WIN32) +IF(WIN32) SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} opengl32) ELSE() SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} GL) @@ -98,7 +98,7 @@ ENDIF() QT4_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES}) #QT5_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES}) -QT4_CREATE_TRANSLATION(QM_RESOURCES +QT4_CREATE_TRANSLATION(QM_RESOURCES ${PROJECT_SOURCES} ${TEXT_RESOURCES} OPTIONS -extensions cpp -no-recursive @@ -111,7 +111,7 @@ SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES} ${PR ADD_DEFINITIONS( -DXGUI_EXPORTS ${CAS_DEFINITIONS} ) -SET(PROJECT_INCLUDES +SET(PROJECT_INCLUDES ${PROJECT_SOURCE_DIR}/src/Events ${PROJECT_SOURCE_DIR}/src/Config ${PROJECT_SOURCE_DIR}/src/ModelAPI @@ -126,13 +126,13 @@ IF(NOT ${HAVE_SALOME}) ENDIF(NOT ${HAVE_SALOME}) INCLUDE_DIRECTORIES(${PROJECT_INCLUDES}) - + LINK_DIRECTORIES($ENV{PYTHON_LIB_DIR}) -ADD_LIBRARY(XGUI SHARED - ${PROJECT_SOURCES} - ${PROJECT_HEADERS} - ${PROJECT_COMPILED_RESOURCES} +ADD_LIBRARY(XGUI SHARED + ${PROJECT_SOURCES} + ${PROJECT_HEADERS} + ${PROJECT_COMPILED_RESOURCES} ${TEXT_RESOURCES} ${QM_RESOURCES} ${PREFERENCES_XML} @@ -143,7 +143,6 @@ ADD_DEPENDENCIES(XGUI ModelAPI) # The Qt5Widgets_LIBRARIES variable also includes QtGui and QtCore TARGET_LINK_LIBRARIES(XGUI ${PROJECT_LIBRARIES}) -INSTALL(TARGETS XGUI DESTINATION bin) -INSTALL(FILES ${QM_RESOURCES} DESTINATION bin) -INSTALL(FILES ${PREFERENCES_XML} DESTINATION resources) - +INSTALL(TARGETS XGUI DESTINATION ${SHAPER_INSTALL_BIN}) +INSTALL(FILES ${QM_RESOURCES} DESTINATION ${SHAPER_INSTALL_QM_RESOURCES}) +INSTALL(FILES ${PREFERENCES_XML} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) -- 2.39.2