]> SALOME platform Git repositories - modules/homard.git/commitdiff
Salome HOME
Merge branch 'V8_0_BR' V8_0_0a2
authorvsr <vsr@opencascade.com>
Fri, 15 Jan 2016 07:31:10 +0000 (10:31 +0300)
committervsr <vsr@opencascade.com>
Fri, 15 Jan 2016 07:31:10 +0000 (10:31 +0300)
1  2 
CMakeLists.txt

diff --combined CMakeLists.txt
index ce776724f23aac80b71dcae4b9f0092df4dc32c9,111e15b125a58365357e590e2db7b0f4ef0d7265..83d6ff3982756be738d6010b22b8e1cd624ecf44
@@@ -17,7 -17,6 +17,7 @@@
  # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
  #
  CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
 +
  PROJECT(SalomeHOMARD C CXX)
  
  # Ensure a proper linker behavior:
@@@ -47,20 -46,6 +47,20 @@@ ELSE(EXISTS ${KERNEL_ROOT_DIR}
    MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR")
  ENDIF(EXISTS ${KERNEL_ROOT_DIR})
  
 +# Find SALOME GUI
 +# ===============
 +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}/adm_local/cmake_files")
 +  FIND_PACKAGE(SalomeGUI REQUIRED)
 +  SALOME_GUI_WITH_CORBA() # check whether GUI builded with CORBA
 +  SALOME_GUI_MODE(OPTIONAL SALOME_USE_PYCONSOLE)
 +  ADD_DEFINITIONS(${GUI_DEFINITIONS})
 +  INCLUDE_DIRECTORIES(${GUI_INCLUDE_DIRS})
 +ELSE(EXISTS ${GUI_ROOT_DIR})
 +  MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR")
 +ENDIF(EXISTS ${GUI_ROOT_DIR})
 +
  # Platform setup
  # ==============
  INCLUDE(SalomeSetupPlatform)   # From KERNEL
@@@ -69,30 -54,15 +69,30 @@@ SET(BUILD_SHARED_LIBS TRUE
  # Local macros:
  LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
  
 +# additional preprocessor / compiler flags
 +#ADD_DEFINITIONS(-DCMAKE_BUILD)
 +IF(WIN32)
 +  ADD_DEFINITIONS(-DNOGDI)
 +ENDIF(WIN32)
 +
  # User options
  # ============
  OPTION(SALOME_BUILD_DOC "Generate SALOME HOMARD documentation" ON)
  OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
  
 +
 +# Other KERNEL optionals: 
  IF(SALOME_BUILD_TESTS)
    ENABLE_TESTING()
 +  FIND_PACKAGE(SalomeCppUnit)
 +  SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS)
 +ENDIF()
 +IF(SALOME_BUILD_DOC)
 +  FIND_PACKAGE(SalomeSphinx)
 +  SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC)
  ENDIF()
  
 +
  ##
  ## From KERNEL:
  ##
@@@ -107,18 -77,45 +107,26 @@@ FIND_PACKAGE(SalomeOmniORBPy REQUIRED
  # HDF5
  FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C)
  
 -# Other KERNEL optionals:
 -IF(SALOME_BUILD_DOC)
 -  FIND_PACKAGE(SalomeSphinx)
 -  SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC)
 -ENDIF()
 -
 -# Find GUI
 -# ===========
 -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}/adm_local/cmake_files")
 -  FIND_PACKAGE(SalomeGUI REQUIRED)
 -  SALOME_GUI_WITH_CORBA() # check whether GUI builded with CORBA
 -  SALOME_GUI_MODE(OPTIONAL SALOME_USE_PYCONSOLE)
 -  ADD_DEFINITIONS(${GUI_DEFINITIONS})
 -  INCLUDE_DIRECTORIES(${GUI_INCLUDE_DIRS})
 -ELSE(EXISTS ${GUI_ROOT_DIR})
 -  MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR")
 -ENDIF(EXISTS ${GUI_ROOT_DIR})
  
  ##
  ## From GUI:
  ##
  
  # Various
- # Qt4
- FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+ # Qt
+ IF (NOT SALOME_GUI_BUILD_WITH_QT5)
+   FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+ ELSE()
+   FIND_PACKAGE(SalomeQt5 REQUIRED)
+ ENDIF()
  # SIP
  FIND_PACKAGE(SalomeSIP REQUIRED)
- # PyQt4
- FIND_PACKAGE(SalomePyQt4 REQUIRED)
+ # PyQt
+ IF (NOT SALOME_GUI_BUILD_WITH_QT5)
+   FIND_PACKAGE(SalomePyQt4 REQUIRED)
+ ELSE()
+   FIND_PACKAGE(SalomePyQt5 REQUIRED)
+ ENDIF()
  # OCCT
  FIND_PACKAGE(SalomeCAS REQUIRED)
  
@@@ -163,34 -160,28 +171,34 @@@ SET(SALOME_INSTALL_BINS "${SALOME_INSTA
  SET(SALOME_INSTALL_LIBS "${SALOME_INSTALL_LIBS}" CACHE PATH "Install path: SALOME libs")
  SET(SALOME_INSTALL_IDLS "${SALOME_INSTALL_IDLS}" CACHE PATH "Install path: SALOME IDL files")
  SET(SALOME_INSTALL_HEADERS "${SALOME_INSTALL_HEADERS}" CACHE PATH "Install path: SALOME headers")
 -SET(SALOME_INSTALL_SCRIPT_SCRIPTS "${SALOME_INSTALL_SCRIPT_SCRIPTS}" CACHE PATH 
 +SET(SALOME_INSTALL_SCRIPT_SCRIPTS "${SALOME_INSTALL_SCRIPT_SCRIPTS}" CACHE PATH
     "Install path: SALOME scripts")
 -SET(SALOME_INSTALL_SCRIPT_DATA "${SALOME_INSTALL_SCRIPT_DATA}" CACHE PATH 
 +SET(SALOME_INSTALL_SCRIPT_DATA "${SALOME_INSTALL_SCRIPT_DATA}" CACHE PATH
     "Install path: SALOME script data")
 -SET(SALOME_INSTALL_SCRIPT_PYTHON "${SALOME_INSTALL_SCRIPT_PYTHON}" CACHE PATH 
 +SET(SALOME_INSTALL_SCRIPT_PYTHON "${SALOME_INSTALL_SCRIPT_PYTHON}" CACHE PATH
     "Install path: SALOME Python scripts")
 -SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "${SALOME_INSTALL_APPLISKEL_SCRIPTS}" CACHE PATH 
 +SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "${SALOME_INSTALL_APPLISKEL_SCRIPTS}" CACHE PATH
     "Install path: SALOME application skeleton - scripts")
 -SET(SALOME_INSTALL_APPLISKEL_PYTHON "${SALOME_INSTALL_APPLISKEL_PYTHON}" CACHE PATH 
 +SET(SALOME_INSTALL_APPLISKEL_PYTHON "${SALOME_INSTALL_APPLISKEL_PYTHON}" CACHE PATH
     "Install path: SALOME application skeleton - Python")
  SET(SALOME_INSTALL_PYTHON "${SALOME_INSTALL_PYTHON}" CACHE PATH "Install path: SALOME Python stuff")
 -SET(SALOME_INSTALL_PYTHON_SHARED "${SALOME_INSTALL_PYTHON_SHARED}" CACHE PATH 
 +SET(SALOME_INSTALL_PYTHON_SHARED "${SALOME_INSTALL_PYTHON_SHARED}" CACHE PATH
     "Install path: SALOME Python shared modules")
 -SET(SALOME_INSTALL_CMAKE_LOCAL "${SALOME_INSTALL_CMAKE_LOCAL}" CACHE PATH 
 -    "Install path: local SALOME CMake files") 
 +SET(SALOME_INSTALL_CMAKE_LOCAL "${SALOME_INSTALL_CMAKE_LOCAL}" CACHE PATH
 +    "Install path: local SALOME CMake files")
  SET(SALOME_INSTALL_AMCONFIG_LOCAL "${SALOME_INSTALL_AMCONFIG_LOCAL}" CACHE PATH
    "Install path: local SALOME config files (obsolete, to be removed)")
  SET(SALOME_INSTALL_RES "${SALOME_INSTALL_RES}" CACHE PATH "Install path: SALOME resources")
  SET(SALOME_INSTALL_DOC "${SALOME_INSTALL_DOC}" CACHE PATH "Install path: SALOME documentation")
  
  # Specific to HOMARD:
 -SET(SALOME_HOMARD_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/homard" CACHE PATH 
 +SET(SALOME_HOMARD_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/homard" CACHE PATH
 +  "Install path: SALOME HOMARD specific data")
 +SET(SALOME_HOMARD_INSTALL_SAMPLES share/salome/homardsamples CACHE PATH
 +  "Install path: SALOME HOMARD samples")
 +SET(SALOME_HOMARD_INSTALL_TEST ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test CACHE PATH
 +    "Install path: SALOME HOMARD Test files")
 +SET(SALOME_HOMARD_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/homard" CACHE PATH
      "Install path: SALOME HOMARD specific data")
  
  MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_IDLS SALOME_INSTALL_HEADERS)
@@@ -198,26 -189,28 +206,26 @@@ MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_
  MARK_AS_ADVANCED(SALOME_INSTALL_APPLISKEL_SCRIPTS  SALOME_INSTALL_APPLISKEL_PYTHON SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES)
  MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED)
  MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG_LOCAL SALOME_INSTALL_DOC)
 +MARK_AS_ADVANCED(SALOME_HOMARD_INSTALL_TEST)
  MARK_AS_ADVANCED(SALOME_HOMARD_INSTALL_RES_DATA)
  
  # Accumulate environment variables for HOMARD module
  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS}
                                                   ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON}
                                                   ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON_SHARED})
 -SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) 
 -                                              
 -# Sources 
 +SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS})
 +
 +# Sources
  # ========
  
  ADD_SUBDIRECTORY(idl)
  ADD_SUBDIRECTORY(adm_local)
  ADD_SUBDIRECTORY(resources)
  ADD_SUBDIRECTORY(src)
 -ADD_SUBDIRECTORY(bin)
 -IF(SALOME_BUILD_TESTS)
 -  ADD_SUBDIRECTORY(tests)
 -ENDIF(SALOME_BUILD_TESTS)
  IF(SALOME_BUILD_DOC)
    ADD_SUBDIRECTORY(doc)
 -ENDIF(SALOME_BUILD_DOC)
 +ENDIF()
 +ADD_SUBDIRECTORY(bin)
  
  # Header configuration
  # ====================
@@@ -267,5 -260,5 +275,5 @@@ INSTALL(FILE
    DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}")
  
  # Install the export set for use with the install-tree
 -INSTALL(EXPORT ${PROJECT_NAME}TargetGroup DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}" 
 +INSTALL(EXPORT ${PROJECT_NAME}TargetGroup DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}"
    FILE ${PROJECT_NAME}Targets.cmake)