From 16995d8863efa156a76de7f3ef19767293db57ec Mon Sep 17 00:00:00 2001 From: mpa Date: Wed, 12 Mar 2014 13:12:26 +0400 Subject: [PATCH] Now some libraries of MEDOP can be build without GUI --- CMakeLists.txt | 8 +++----- src/CMakeLists.txt | 2 +- src/MEDOP/CMakeLists.txt | 13 ++++++++++--- src/MEDOP/cmp/CMakeLists.txt | 4 +++- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c5608411..7f12b2bb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -336,7 +336,7 @@ IF(NOT SALOME_MED_STANDALONE) LIST(APPEND _${PROJECT_NAME}_exposed_targets SalomeIDLMED SalomeIDLMEDTests medcouplingcorba medcouplingclient) IF(NOT SALOME_MED_MICROMED) - LIST(APPEND _${PROJECT_NAME}_exposed_targets medcalculator) + LIST(APPEND _${PROJECT_NAME}_exposed_targets medcalculator MEDOPFactoryEngine) IF(SALOME_MED_ENABLE_PYTHON) LIST(APPEND _${PROJECT_NAME}_exposed_targets medcalculatorspython) ENDIF() @@ -345,10 +345,8 @@ ENDIF() IF(SALOME_BUILD_GUI) IF(NOT SALOME_MED_MICROMED) - IF(SALOME_MED_ENABLE_PYTHON) - LIST(APPEND _${PROJECT_NAME}_exposed_targets - MEDOPFactoryEngine MEDOPGUI_dialogs MEDOPGUI) - ENDIF() + LIST(APPEND _${PROJECT_NAME}_exposed_targets + MEDOPGUI_dialogs MEDOPGUI) ENDIF() ENDIF() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6ec53358d..d261cdb27 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -63,6 +63,7 @@ IF(NOT SALOME_MED_STANDALONE) ADD_SUBDIRECTORY(MEDCouplingCorba) IF(NOT SALOME_MED_MICROMED) ADD_SUBDIRECTORY(MEDCalculator) + ADD_SUBDIRECTORY(MEDOP) ENDIF(NOT SALOME_MED_MICROMED) IF(SALOME_MED_ENABLE_PYTHON) ADD_SUBDIRECTORY(MEDCouplingCorba_Swig) @@ -73,7 +74,6 @@ IF(SALOME_BUILD_GUI) IF(NOT SALOME_MED_MICROMED) IF(SALOME_MED_ENABLE_PYTHON) #ADD_SUBDIRECTORY(MEDGUI) - ADD_SUBDIRECTORY(MEDOP) ENDIF(SALOME_MED_ENABLE_PYTHON) ENDIF(NOT SALOME_MED_MICROMED) ENDIF(SALOME_BUILD_GUI) diff --git a/src/MEDOP/CMakeLists.txt b/src/MEDOP/CMakeLists.txt index c41e2b2fb..8411c6ae6 100644 --- a/src/MEDOP/CMakeLists.txt +++ b/src/MEDOP/CMakeLists.txt @@ -18,10 +18,17 @@ # ADD_SUBDIRECTORY(cmp) -ADD_SUBDIRECTORY(tui) ADD_SUBDIRECTORY(res) -ADD_SUBDIRECTORY(gui) -ADD_SUBDIRECTORY(exe) + +IF(SALOME_BUILD_GUI) + ADD_SUBDIRECTORY(gui) +ENDIF() + +IF(SALOME_MED_ENABLE_PYTHON) + ADD_SUBDIRECTORY(tui) + ADD_SUBDIRECTORY(exe) +ENDIF() + IF(SALOME_BUILD_DOC) ADD_SUBDIRECTORY(doc) ENDIF(SALOME_BUILD_DOC) diff --git a/src/MEDOP/cmp/CMakeLists.txt b/src/MEDOP/cmp/CMakeLists.txt index 78d8be588..2849b66eb 100644 --- a/src/MEDOP/cmp/CMakeLists.txt +++ b/src/MEDOP/cmp/CMakeLists.txt @@ -71,4 +71,6 @@ INSTALL(TARGETS MEDOPFactoryEngine DESTINATION ${SALOME_INSTALL_LIBS}) FILE(GLOB MEDOPFactoryEngine_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") INSTALL(FILES ${MEDOPFactoryEngine_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS}) -INSTALL(FILES test_medop_components.py PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ DESTINATION ${SALOME_INSTALL_BINS}/xmed) +IF(SALOME_ENABLE_PYTHON) + INSTALL(FILES test_medop_components.py PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ DESTINATION ${SALOME_INSTALL_BINS}/xmed) +ENDIF() -- 2.39.2