X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=2d8fef60ec80470adc09fe7f626e3e74aadf22a2;hb=6e71f6c49f075cb3d8e60c0a116ba9567c4316c0;hp=cab33dbc4ec6bd7fb949dd3a27de6fa058d29f16;hpb=b9636a8e25411b3c89aa64801b659bb363278661;p=modules%2Fshaper.git diff --git a/CMakeLists.txt b/CMakeLists.txt index cab33dbc4..2d8fef60e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2014-2019 CEA/DEN, EDF R&D +# Copyright (C) 2014-2020 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -20,22 +20,25 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10) PROJECT (SHAPER) +SET(${PROJECT_NAME}_MAJOR_VERSION 9) +SET(${PROJECT_NAME}_MINOR_VERSION 6) +SET(${PROJECT_NAME}_PATCH_VERSION 0) +SET(${PROJECT_NAME}_VERSION ${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}.${${PROJECT_NAME}_PATCH_VERSION}) + # Ensure a proper linker behavior: CMAKE_POLICY(SET CMP0003 NEW) IF(WIN32) CMAKE_POLICY(SET CMP0020 OLD) # disable automatic linking to qtmain.lib ENDIF(WIN32) -SET (SHAPER_Version 9.3.0) - SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH}) -OPTION(SHAPER_BUILD_DOC "Generate SHAPER documentation" ON) -INCLUDE(SalomeMacros) +IF (NOT CADBUILDER_BUILD_DOC) + OPTION(SHAPER_BUILD_DOC "Generate SHAPER documentation" ON) +ENDIF(NOT CADBUILDER_BUILD_DOC) INCLUDE(FindEclipse) INCLUDE(Common) -INCLUDE(FindSalomeQt5) INCLUDE(FindSalome) INCLUDE(FindSUIT) INCLUDE(FindTInspector) @@ -45,6 +48,7 @@ IF(${HAVE_SALOME}) IF(EXISTS ${CONFIGURATION_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake") INCLUDE(SalomeMacros) + INCLUDE(FindSalomeQt5) ELSE() MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !") ENDIF() @@ -57,6 +61,11 @@ IF(${HAVE_SALOME}) ELSE(EXISTS ${KERNEL_ROOT_DIR}) MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR") ENDIF(EXISTS ${KERNEL_ROOT_DIR}) + SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI") + IF(EXISTS ${GUI_ROOT_DIR}) + LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/salome_adm/cmake_files") + FIND_PACKAGE(SalomeGUI REQUIRED) + ENDIF(EXISTS ${GUI_ROOT_DIR}) INCLUDE(SalomeSetupPlatform) # From CONFIGURATION FIND_PACKAGE(SalomePythonInterp REQUIRED) @@ -65,6 +74,8 @@ IF(${HAVE_SALOME}) FIND_PACKAGE(SalomeOpenCASCADE REQUIRED) ELSE(${HAVE_SALOME}) + INCLUDE(SalomeMacros) + INCLUDE(FindSalomeQt5) INCLUDE(FindPython) INCLUDE(FindSalomeOpenCASCADE) ENDIF(${HAVE_SALOME}) @@ -78,7 +89,7 @@ IF(DEFINED ENV{LIBXML2_ROOT_DIR}) IF(WIN32) FILE(TO_CMAKE_PATH $ENV{LIBXML2_ROOT_DIR}/lib/libxml2.lib LIBXML2_LIBRARIES) FILE(TO_CMAKE_PATH $ENV{LIBXML2_ROOT_DIR}/include LIBXML2_INCLUDE_DIR) - ELSE() + ELSEIF(NOT "$ENV{LIBXML2_ROOT_DIR}" STREQUAL "/usr") FILE(TO_CMAKE_PATH $ENV{LIBXML2_ROOT_DIR}/lib/libxml2.so LIBXML2_LIBRARIES) FILE(TO_CMAKE_PATH $ENV{LIBXML2_ROOT_DIR}/include/libxml2 LIBXML2_INCLUDE_DIR) ENDIF() @@ -94,6 +105,7 @@ IF(${HAVE_SALOME}) SET(SHAPER_INSTALL_BIN lib/salome CACHE INTERNAL "" FORCE) SET(SHAPER_INSTALL_PLUGIN_FILES lib/salome CACHE INTERNAL "" FORCE) SET(SHAPER_INSTALL_PYTHON_FILES bin/salome CACHE INTERNAL "" FORCE) + SET(SHAPER_INSTALL_HEADERS include/salome CACHE INTERNAL "" FORCE) SET(SHAPER_INSTALL_RESOURCES share/salome/resources/shaper 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) @@ -105,6 +117,7 @@ IF(${HAVE_SALOME}) ELSE(${HAVE_SALOME}) SET(SHAPER_INSTALL_ADDONS addons CACHE INTERNAL "" FORCE) SET(SHAPER_INSTALL_BIN bin CACHE INTERNAL "" FORCE) + SET(SHAPER_INSTALL_HEADERS include CACHE INTERNAL "" FORCE) SET(SHAPER_INSTALL_PLUGIN_FILES plugins CACHE INTERNAL "" FORCE) SET(SHAPER_INSTALL_PYTHON_FILES plugins CACHE INTERNAL "" FORCE) SET(SHAPER_INSTALL_RESOURCES resources CACHE INTERNAL "" FORCE) @@ -114,10 +127,29 @@ ELSE(${HAVE_SALOME}) SET(SHAPER_INSTALL_TUI_DOC doc CACHE INTERNAL "" FORCE) ENDIF(${HAVE_SALOME}) +# Test environment +# =================== + +SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_BIN}") +SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_SWIG}") +SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_PLUGIN_FILES}") +SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK "${SUIT_LIB_DIR}") +SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK "${SALOME_KERNEL_LIBDIR}") + +SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_SWIG}") +SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_PLUGIN_FILES}") +SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_ADDONS}") + +SET(SALOME_SHAPER_INSTALL_TESTS "${SHAPER_INSTALL_PYTHON_FILES}/test" CACHE PATH "Path to tests directory") + # Sketcher: Change radius of circular edges while dragging a point on the edge SET(SKETCHER_CHANGE_RADIUS_WHEN_MOVE TRUE) +SET(MAKE_TRANSLATION YES) +ADD_DEFINITIONS( -DMAKE_TRANSLATION ) + ADD_SUBDIRECTORY (src/Config) +ADD_SUBDIRECTORY (src/Locale) ADD_SUBDIRECTORY (src/Events) ADD_SUBDIRECTORY (src/Selector) ADD_SUBDIRECTORY (src/Model) @@ -146,6 +178,7 @@ ADD_SUBDIRECTORY (src/PartSet) ADD_SUBDIRECTORY (src/XGUI) ADD_SUBDIRECTORY (src/ExchangePlugin) ADD_SUBDIRECTORY (src/GeomValidators) +ADD_SUBDIRECTORY (src/FiltersPlugin) ADD_SUBDIRECTORY (src/InitializationPlugin) ADD_SUBDIRECTORY (src/ParametersPlugin) ADD_SUBDIRECTORY (src/PythonAddons) @@ -163,6 +196,7 @@ ADD_SUBDIRECTORY (src/PrimitivesAPI) ADD_SUBDIRECTORY (src/SketchAPI) ADD_SUBDIRECTORY (src/GDMLAPI) ADD_SUBDIRECTORY (src/ConnectorAPI) +ADD_SUBDIRECTORY (src/FiltersAPI) # Tests ADD_SUBDIRECTORY (test.API/SHAPER) @@ -183,9 +217,16 @@ IF(ADD_COMPATIBILITY_TESTS) ADD_CUSTOM_TARGET(run_compatibility_tests COMMAND ${CMAKE_CTEST_COMMAND} -C "${CMAKE_BUILD_TYPE}" -LE "tests_compatibility") ENDIF(ADD_COMPATIBILITY_TESTS) -IF(ADD_HDF_TESTS) - ADD_SUBDIRECTORY (test.hdfs) -ENDIF(ADD_HDF_TESTS) +IF(${HAVE_SALOME}) + IF(ADD_HDF_TESTS) + ADD_SUBDIRECTORY (test.hdfs) + ENDIF(ADD_HDF_TESTS) + + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/CTestTestfileInstall.cmake + DESTINATION ${SALOME_SHAPER_INSTALL_TESTS} + RENAME CTestTestfile.cmake) +ENDIF(${HAVE_SALOME}) + IF(SHAPER_BUILD_DOC) INCLUDE(FindSphinx)