From 67ed03ceb229358e92e3c888f04da296ac2221d4 Mon Sep 17 00:00:00 2001 From: Louis Gombert Date: Wed, 28 Aug 2024 07:45:15 +0000 Subject: [PATCH] Restore build parts requiring Python --- CMakeLists.txt | 17 +++-------------- bin/CMakeLists.txt | 8 ++++---- doc/salome/gui/GEOM/CMakeLists.txt | 6 +++--- src/GEOM_PY/CMakeLists.txt | 4 ++-- src/GEOM_PY/structelem/CMakeLists.txt | 2 +- src/GEOM_SWIG/CMakeLists.txt | 24 ++++++++++++------------ src/GEOM_SWIG_WITHIHM/CMakeLists.txt | 2 +- src/Tools/CMakeLists.txt | 2 +- src/Tools/t_shape/CMakeLists.txt | 6 +++--- src/XAO_Swig/CMakeLists.txt | 2 +- 10 files changed, 31 insertions(+), 42 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d678a7a52..63ba0b34f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,17 +36,6 @@ else() message("Not using Emscripten") endif() -# WASM libraries cannot be shared -macro(ADD_GOEM_LIBRARY NAME SOURCES) - IF (NOT DEFINED EMSCRIPTEN) - ADD_LIBRARY(${NAME} SHARED ${SOURCES}) - ELSE() - ADD_LIBRARY(${NAME} STATIC ${SOURCES}) - ENDIF() -endmacro() - -message("Size of voidP " ${CMAKE_SIZEOF_VOID_P}) - # Common CMake macros # =================== SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files") @@ -57,7 +46,6 @@ ELSE() MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !") ENDIF() - # Versioning # =========== SALOME_SETUP_VERSION(9.12.0) @@ -65,11 +53,10 @@ MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \ # Find KERNEL # =========== -FIND_PACKAGE(SalomeOpenCASCADE REQUIRED) SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL") IF(EXISTS ${KERNEL_ROOT_DIR}) - FIND_PACKAGE(SalomeKERNEL "9.12.0" REQUIRED) + FIND_PACKAGE(SalomeKERNEL REQUIRED) KERNEL_WITH_CORBA() #check whether KERNEL built with CORBA ADD_DEFINITIONS(${KERNEL_DEFINITIONS}) INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS}) @@ -170,6 +157,8 @@ ENDIF(SALOME_BUILD_GUI) ## GEOM specifics ## +FIND_PACKAGE(SalomeOpenCASCADE REQUIRED) + IF(SALOME_GEOM_USE_VTK) FIND_PACKAGE(SalomeVTK REQUIRED) ADD_DEFINITIONS(-DWITH_VTK) diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt index 55725449d..3a2adfa1a 100644 --- a/bin/CMakeLists.txt +++ b/bin/CMakeLists.txt @@ -23,7 +23,7 @@ SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS}) # Files to be installed # =============================================================== -# SET(_bin_scripts -# addvars2notebook_GEOM.py geom_setenv.py geom_test.py -# ) -# SALOME_INSTALL_SCRIPTS("${_bin_scripts}" ${SALOME_INSTALL_SCRIPT_SCRIPTS}) +SET(_bin_scripts + addvars2notebook_GEOM.py geom_setenv.py geom_test.py +) +SALOME_INSTALL_SCRIPTS("${_bin_scripts}" ${SALOME_INSTALL_SCRIPT_SCRIPTS}) diff --git a/doc/salome/gui/GEOM/CMakeLists.txt b/doc/salome/gui/GEOM/CMakeLists.txt index cce2ea530..ba55c0d8b 100644 --- a/doc/salome/gui/GEOM/CMakeLists.txt +++ b/doc/salome/gui/GEOM/CMakeLists.txt @@ -48,9 +48,9 @@ IF(WIN32 AND "$ENV{SALOME_HAS_GLOBAL_ENV}" STREQUAL "1") LIST(APPEND ADD_VARS PATH=${KERNEL_ROOT_DIR}/lib/salome) ENDIF() -# SALOME_GENERATE_ENVIRONMENT_SCRIPT(plugins_cmd env_script "${PYTHON_EXECUTABLE}" "${plugins_cmd_options}" ADDITIONAL_VARIABLES ${ADD_VARS}) -# # Install a script -# SALOME_INSTALL_SCRIPTS(collect_geom_methods.py ${SALOME_INSTALL_BINS}) +SALOME_GENERATE_ENVIRONMENT_SCRIPT(plugins_cmd env_script "${PYTHON_EXECUTABLE}" "${plugins_cmd_options}" ADDITIONAL_VARIABLES ${ADD_VARS}) +# Install a script +SALOME_INSTALL_SCRIPTS(collect_geom_methods.py ${SALOME_INSTALL_BINS}) SET(f "$ENV{KERNEL_ROOT_DIR}/bin/salome/prepare_generating_doc.py") IF(WIN32) diff --git a/src/GEOM_PY/CMakeLists.txt b/src/GEOM_PY/CMakeLists.txt index d9100cbb8..bf7311cf0 100644 --- a/src/GEOM_PY/CMakeLists.txt +++ b/src/GEOM_PY/CMakeLists.txt @@ -28,5 +28,5 @@ SET(_python_SCRIPTS # --- rules --- -# SALOME_INSTALL_SCRIPTS("${_python_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom) -# SALOME_CONFIGURE_FILE(__init__.py __init__.py INSTALL ${SALOME_INSTALL_PYTHON}/salome/geom) +SALOME_INSTALL_SCRIPTS("${_python_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom) +SALOME_CONFIGURE_FILE(__init__.py __init__.py INSTALL ${SALOME_INSTALL_PYTHON}/salome/geom) diff --git a/src/GEOM_PY/structelem/CMakeLists.txt b/src/GEOM_PY/structelem/CMakeLists.txt index ce4a10b9a..027a74bae 100644 --- a/src/GEOM_PY/structelem/CMakeLists.txt +++ b/src/GEOM_PY/structelem/CMakeLists.txt @@ -27,4 +27,4 @@ SET(_python_SCRIPTS # --- rules --- -# SALOME_INSTALL_SCRIPTS("${_python_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/structelem) +SALOME_INSTALL_SCRIPTS("${_python_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/structelem) diff --git a/src/GEOM_SWIG/CMakeLists.txt b/src/GEOM_SWIG/CMakeLists.txt index 93a970bbb..59fda0da7 100644 --- a/src/GEOM_SWIG/CMakeLists.txt +++ b/src/GEOM_SWIG/CMakeLists.txt @@ -135,17 +135,17 @@ SET(_shared_SCRIPTS ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ) # --- rules --- -# SALOME_INSTALL_SCRIPTS("${_other_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_DATA} DEF_PERMS) -# SALOME_INSTALL_SCRIPTS("${_shared_SCRIPTS}" ${SALOME_INSTALL_PYTHON_SHARED} DEF_PERMS) -# SALOME_INSTALL_SCRIPTS("${_python_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom DEF_PERMS) +SALOME_INSTALL_SCRIPTS("${_other_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_DATA} DEF_PERMS) +SALOME_INSTALL_SCRIPTS("${_shared_SCRIPTS}" ${SALOME_INSTALL_PYTHON_SHARED} DEF_PERMS) +SALOME_INSTALL_SCRIPTS("${_python_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom DEF_PERMS) # # Install plugin scripts -# SALOME_INSTALL_SCRIPTS("${_python_advanced_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/AdvancedGEOM DEF_PERMS) -# SALOME_INSTALL_SCRIPTS("${_python_STL_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/STLPlugin DEF_PERMS) -# SALOME_INSTALL_SCRIPTS("${_python_BREP_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/BREPPlugin DEF_PERMS) -# SALOME_INSTALL_SCRIPTS("${_python_STEP_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/STEPPlugin DEF_PERMS) -# SALOME_INSTALL_SCRIPTS("${_python_IGES_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/IGESPlugin DEF_PERMS) -# SALOME_INSTALL_SCRIPTS("${_python_XAO_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/XAOPlugin DEF_PERMS) -# IF(SALOME_GEOM_USE_VTK) -# SALOME_INSTALL_SCRIPTS("${_python_VTK_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/VTKPlugin DEF_PERMS) -# ENDIF(SALOME_GEOM_USE_VTK) +SALOME_INSTALL_SCRIPTS("${_python_advanced_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/AdvancedGEOM DEF_PERMS) +SALOME_INSTALL_SCRIPTS("${_python_STL_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/STLPlugin DEF_PERMS) +SALOME_INSTALL_SCRIPTS("${_python_BREP_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/BREPPlugin DEF_PERMS) +SALOME_INSTALL_SCRIPTS("${_python_STEP_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/STEPPlugin DEF_PERMS) +SALOME_INSTALL_SCRIPTS("${_python_IGES_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/IGESPlugin DEF_PERMS) +SALOME_INSTALL_SCRIPTS("${_python_XAO_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/XAOPlugin DEF_PERMS) +IF(SALOME_GEOM_USE_VTK) + SALOME_INSTALL_SCRIPTS("${_python_VTK_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/VTKPlugin DEF_PERMS) +ENDIF(SALOME_GEOM_USE_VTK) diff --git a/src/GEOM_SWIG_WITHIHM/CMakeLists.txt b/src/GEOM_SWIG_WITHIHM/CMakeLists.txt index 1d05c7e50..14794abdd 100644 --- a/src/GEOM_SWIG_WITHIHM/CMakeLists.txt +++ b/src/GEOM_SWIG_WITHIHM/CMakeLists.txt @@ -88,5 +88,5 @@ ENDIF(WIN32) INSTALL(TARGETS _libGEOM_Swig DESTINATION ${SALOME_INSTALL_PYTHON}) -# SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_PYTHON} EXTRA_DPYS "${SWIG_MODULE_libGEOM_Swig_REAL_NAME}") +SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_PYTHON} EXTRA_DPYS "${SWIG_MODULE_libGEOM_Swig_REAL_NAME}") diff --git a/src/Tools/CMakeLists.txt b/src/Tools/CMakeLists.txt index 2a86f24fe..aba09731e 100644 --- a/src/Tools/CMakeLists.txt +++ b/src/Tools/CMakeLists.txt @@ -27,5 +27,5 @@ IF(SALOME_BUILD_GUI) ) # --- rules --- - # SALOME_INSTALL_SCRIPTS("${plugin_SCRIPTS}" ${SALOME_GEOM_INSTALL_PLUGINS}) + SALOME_INSTALL_SCRIPTS("${plugin_SCRIPTS}" ${SALOME_GEOM_INSTALL_PLUGINS}) ENDIF() diff --git a/src/Tools/t_shape/CMakeLists.txt b/src/Tools/t_shape/CMakeLists.txt index d58dcbcc1..a7467634f 100644 --- a/src/Tools/t_shape/CMakeLists.txt +++ b/src/Tools/t_shape/CMakeLists.txt @@ -48,11 +48,11 @@ ENDIF() # --- rules --- -# SALOME_INSTALL_SCRIPTS("${_base_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape) +SALOME_INSTALL_SCRIPTS("${_base_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape) IF(SALOME_BUILD_GUI) - # SALOME_INSTALL_SCRIPTS("${_gui_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape) - # SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape TARGET_NAME _target_name_pyuic_py) + SALOME_INSTALL_SCRIPTS("${_gui_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape) + SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape TARGET_NAME _target_name_pyuic_py) # add dependency of compiled py files on uic files in order # to avoid races problems when compiling in parallel ADD_DEPENDENCIES(${_target_name_pyuic_py} ${_target_name_pyuic}) diff --git a/src/XAO_Swig/CMakeLists.txt b/src/XAO_Swig/CMakeLists.txt index 9954db396..9eda677e2 100644 --- a/src/XAO_Swig/CMakeLists.txt +++ b/src/XAO_Swig/CMakeLists.txt @@ -71,4 +71,4 @@ ENDIF(WIN32) INSTALL(TARGETS _xao DESTINATION ${SALOME_INSTALL_PYTHON}) INSTALL(FILES xao.i DESTINATION ${SALOME_INSTALL_HEADERS}) -# SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_PYTHON} EXTRA_DPYS "${SWIG_MODULE_xao_REAL_NAME}") +SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_PYTHON} EXTRA_DPYS "${SWIG_MODULE_xao_REAL_NAME}")