]> SALOME platform Git repositories - modules/jobmanager.git/commitdiff
Salome HOME
Porting JOBMANAGER SALOME module to the CMake build system: initial version.
authorrnv <rnv@opencascade.com>
Fri, 25 Oct 2013 05:32:48 +0000 (05:32 +0000)
committerrnv <rnv@opencascade.com>
Fri, 25 Oct 2013 05:32:48 +0000 (05:32 +0000)
44 files changed:
CMakeLists.txt [new file with mode: 0755]
JOBMANAGER_version.h.in [new file with mode: 0755]
Makefile.am [deleted file]
SalomeJOBMANAGERConfig.cmake.in [new file with mode: 0644]
adm_local/CMakeLists.txt [new file with mode: 0755]
adm_local/cmake_files/CMakeLists.txt [new file with mode: 0755]
adm_local/cmake_files/FindSalomeJOBMANAGER.cmake [new file with mode: 0644]
adm_local/unix/CMakeLists.txt [new file with mode: 0755]
adm_local/unix/config_files/CMakeLists.txt [new file with mode: 0755]
adm_local/unix/config_files/ac_cxx_option.m4 [new file with mode: 0644]
adm_local/unix/config_files/ac_linker_options.m4 [new file with mode: 0644]
adm_local/unix/config_files/acx_pthread.m4 [new file with mode: 0644]
adm_local/unix/config_files/check_boost.m4 [new file with mode: 0644]
adm_local/unix/config_files/check_omniorb.m4 [new file with mode: 0644]
adm_local/unix/config_files/check_salome.m4 [new file with mode: 0644]
adm_local/unix/config_files/check_sphinx.m4 [new file with mode: 0644]
adm_local/unix/config_files/enable_pthreads.m4 [new file with mode: 0644]
adm_local/unix/config_files/i2_check_qt4.m4 [new file with mode: 0644]
adm_local/unix/config_files/production.m4 [new file with mode: 0644]
build_cmake [deleted file]
build_cmake.bat [deleted file]
build_configure [deleted file]
clean_configure [deleted file]
configure.ac [deleted file]
doc/CMakeLists.txt [new file with mode: 0755]
doc/Makefile.am [deleted file]
doc/conf.py.in
idl/CMakeLists.txt [new file with mode: 0755]
idl/Makefile.am [deleted file]
src/CMakeLists.txt [new file with mode: 0755]
src/Makefile.am [deleted file]
src/bases/CMakeLists.txt [new file with mode: 0644]
src/bases/Makefile.am [deleted file]
src/engine/CMakeLists.txt [new file with mode: 0644]
src/engine/Makefile.am [deleted file]
src/genericgui/BL_CreateJobWizard.cxx
src/genericgui/CMakeLists.txt [new file with mode: 0644]
src/genericgui/Makefile.am [deleted file]
src/salomegui/CMakeLists.txt [new file with mode: 0644]
src/salomegui/Makefile.am [deleted file]
src/standalone/CMakeLists.txt [new file with mode: 0644]
src/standalone/Makefile.am [deleted file]
src/wrappers/CMakeLists.txt [new file with mode: 0644]
src/wrappers/Makefile.am [deleted file]

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..df9b1a3
--- /dev/null
@@ -0,0 +1,195 @@
+# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
+PROJECT(SalomeJOBMANAGER C CXX)
+
+# Ensure a proper linker behavior:
+CMAKE_POLICY(SET CMP0003 NEW)
+
+# Versioning
+# ===========
+# Project name, upper case
+STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
+
+SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
+SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
+SET(${PROJECT_NAME_UC}_VERSION
+  ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
+
+# Find KERNEL
+# ===========
+SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
+IF(EXISTS ${KERNEL_ROOT_DIR})
+  LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files")
+  INCLUDE(SalomeMacros)
+  FIND_PACKAGE(SalomeKERNEL REQUIRED)
+ELSE(EXISTS ${KERNEL_ROOT_DIR})
+  MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR")
+ENDIF(EXISTS ${KERNEL_ROOT_DIR})
+
+IF(SALOME_LIGHT_ONLY)
+  MESSAGE(FATAL_ERROR "JOBMANAGER module can't be built in Light mode (without CORBA)")
+ENDIF()
+
+# Platform setup
+# ==============
+INCLUDE(SalomeSetupPlatform)   # From KERNEL
+# Always build libraries as shared objects:
+SET(BUILD_SHARED_LIBS TRUE)
+# Local macros:
+LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
+
+# User options
+# (some options have already been defined in KERNEL) 
+# ============
+#OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ${SALOME_BUILD_TESTS}) For use in the future
+OPTION(SALOME_BUILD_DOC "Generate SALOME JOBMANAGER documentation" ${SALOME_BUILD_DOC})
+
+##
+## From KERNEL:
+##
+
+# Various
+# Boost
+FIND_PACKAGE(SalomeBoost REQUIRED)
+# CORBA
+FIND_PACKAGE(SalomeOmniORB REQUIRED)
+
+# Other KERNEL optionals:
+IF(SALOME_USE_MPI)
+  FIND_PACKAGE(SalomeMPI) # needed for doc generation by Sphinx
+ENDIF()
+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)
+ELSE(EXISTS ${GUI_ROOT_DIR})
+  MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR")
+ENDIF(EXISTS ${GUI_ROOT_DIR})
+
+# Qt4
+FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml)
+INCLUDE(${QT_USE_FILE})
+
+# Detection summary:
+SALOME_PACKAGE_REPORT_AND_CHECK()
+
+# Directories
+# (default values taken from KERNEL)
+# ===========
+SET(SALOME_INSTALL_BINS "${SALOME_INSTALL_BINS}" CACHE PATH "Install path: SALOME binaries")
+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 
+   "Install path: SALOME scripts")
+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 
+   "Install path: SALOME Python scripts")
+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 
+   "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 
+   "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_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 JOBMANAGER:
+SET(SALOME_JOBMANAGER_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/jobmanager" CACHE PATH 
+    "Install path: SALOME JOBMANAGER specific data")
+
+MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_IDLS SALOME_INSTALL_HEADERS)
+MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_SCRIPTS SALOME_INSTALL_SCRIPT_DATA SALOME_INSTALL_SCRIPT_PYTHON)
+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_JOBMANAGER_INSTALL_RES_DATA)
+
+# Sources 
+# ========
+
+ADD_SUBDIRECTORY(idl)
+ADD_SUBDIRECTORY(adm_local)
+ADD_SUBDIRECTORY(src)
+IF(SALOME_BUILD_DOC)
+  ADD_SUBDIRECTORY(doc)
+ENDIF(SALOME_BUILD_DOC)
+
+# Header configuration
+# ====================
+SALOME_XVERSION(${PROJECT_NAME})
+SALOME_CONFIGURE_FILE(JOBMANAGER_version.h.in JOBMANAGER_version.h INSTALL ${SALOME_INSTALL_HEADERS})
+
+# Configuration export
+# (here only the level 1 prerequisites are exposed)
+# ====================
+INCLUDE(CMakePackageConfigHelpers)
+
+# List of targets in this project we want to make visible to the rest of the world.
+# They all have to be INSTALL'd with the option "EXPORT ${PROJECT_NAME}TargetGroup"
+SET(_${PROJECT_NAME}_exposed_targets 
+  BL_Bases BL_Engine BL_GenericGui JOBMANAGER BL_Wrappers_Qt BL_Wrappers_SALOME JOBMANAGER_IDL
+)
+
+# Add all targets to the build-tree export set
+EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
+  FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake)
+
+# Create the configuration files:
+#   - in the build tree:
+
+# Ensure the variables are always defined for the configure:
+SET(GUI_ROOT_DIR "${GUI_ROOT_DIR}")
+SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include")
+CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in
+    ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+    INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}"
+    PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX
+    GUI_ROOT_DIR)
+
+WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+    VERSION ${${PROJECT_NAME_UC}_VERSION}
+    COMPATIBILITY AnyNewerVersion)
+
+# Install the CMake configuration files:
+INSTALL(FILES
+  "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+  "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+  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}" 
+  FILE ${PROJECT_NAME}Targets.cmake)
diff --git a/JOBMANAGER_version.h.in b/JOBMANAGER_version.h.in
new file mode 100755 (executable)
index 0000000..358eed4
--- /dev/null
@@ -0,0 +1,45 @@
+// Copyright (C) 2009-2013  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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//  File   : JOBMANAGER_version.h
+//  Author : Lioka RAZAFINDRAZAKA (CEA)
+//  Module : SALOME
+//
+#if !defined(__JOBMANAGER_VERSION_H__)
+#define __JOBMANAGER_VERSION_H__
+
+/*!
+  Specify version of SALOME JOBMANAGER module, as follows
+
+  JOBMANAGER_VERSION_MAJOR       : (integer) number identifying major version
+  JOBMANAGER_VERSION_MINOR       : (integer) number identifying minor version
+  JOBMANAGER_VERSION_MAINTENANCE : (integer) number identifying maintenance version
+  JOBMANAGER_VERSION_STR         : (string)  complete version number "major.minor.maintenance"
+  JOBMANAGER_VERSION             : (hex)     complete version number (major << 16) + (minor << 8) + maintenance
+  JOBMANAGER_DEVELOPMENT         : (integer) indicates development version when set to 1
+*/
+
+#define JOBMANAGER_VERSION_MAJOR       @SALOMEJOBMANAGER_MAJOR_VERSION@
+#define JOBMANAGER_VERSION_MINOR       @SALOMEJOBMANAGER_MINOR_VERSION@
+#define JOBMANAGER_VERSION_MAINTENANCE @SALOMEJOBMANAGER_PATCH_VERSION@
+#define JOBMANAGER_VERSION_STR         "@SALOMEJOBMANAGER_VERSION@"
+#define JOBMANAGER_VERSION             @SALOMEJOBMANAGER_XVERSION@
+#define JOBMANAGER_DEVELOPMENT         @SALOMEJOBMANAGER_VERSION_DEV@
+
+#endif // __JOBMANAGER_VERSION_H__
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644 (file)
index 1e496a8..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2009-2013  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
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-ACLOCAL_AMFLAGS = -I m4
-
-SUBDIRS = idl src doc
-
-EXTRA_DIST = build_configure clean_configure
diff --git a/SalomeJOBMANAGERConfig.cmake.in b/SalomeJOBMANAGERConfig.cmake.in
new file mode 100644 (file)
index 0000000..d80ccde
--- /dev/null
@@ -0,0 +1,104 @@
+# - Config file for the @PROJECT_NAME@ package
+# It defines the following variables. 
+# Specific to the pacakge @PROJECT_NAME@ itself:
+#  @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file
+#
+
+###############################################################
+#  Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/ or
+#  email : webmaster.salome@opencascade.com
+###############################################################
+
+### Initialisation performed by CONFIGURE_PACKAGE_CONFIG_FILE:
+@PACKAGE_INIT@
+
+# Load the dependencies for the libraries of @PROJECT_NAME@ 
+# (contains definitions for IMPORTED targets). This is only 
+# imported if we are not built as a subproject (in this case targets are already there)
+IF(NOT TARGET BL_Engine AND NOT @PROJECT_NAME@_BINARY_DIR)
+  INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake")
+ENDIF()
+
+# Package root dir:
+SET_AND_CHECK(JOBMANAGER_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
+
+# Include directories
+SET_AND_CHECK(JOBMANAGER_INCLUDE_DIRS "${JOBMANAGER_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+
+#### Now the specificities
+
+# Options exported by the package:
+#SET(SALOME_BUILD_TESTS @SALOME_BUILD_TESTS@)
+SET(SALOME_JOBMANAGER_BUILD_DOC   @SALOME_BUILD_DOC@)
+
+# Level 1 prerequisites:
+SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@")
+
+# For all prerequisites, load the corresponding targets if the package was used 
+# in CONFIG mode. This ensures dependent projects link correctly
+# without having to set LD_LIBRARY_PATH:
+SET(_PREREQ )
+SET(_PREREQ_CONFIG_DIR )
+LIST(LENGTH _PREREQ_CONFIG_DIR _list_len)
+# Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ...
+MATH(EXPR _range "${_list_len}-1")
+FOREACH(_p RANGE ${_range})  
+  LIST(GET _PREREQ            ${_p} _pkg    )
+  LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir)
+  IF(_pkg_dir)
+     MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...")
+     FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE 
+          PATHS "${_pkg_dir}" 
+          NO_DEFAULT_PATH)
+  ENDIF()
+ENDFOREACH()
+
+# Installation directories
+SET(SALOME_INSTALL_BINS "@SALOME_INSTALL_BINS@")
+SET(SALOME_INSTALL_LIBS "@SALOME_INSTALL_LIBS@")
+SET(SALOME_INSTALL_IDLS "@SALOME_INSTALL_IDLS@")
+SET(SALOME_INSTALL_HEADERS "@SALOME_INSTALL_HEADERS@")
+SET(SALOME_INSTALL_SCRIPT_SCRIPTS "@SALOME_INSTALL_SCRIPT_SCRIPTS@")
+SET(SALOME_INSTALL_SCRIPT_DATA "@SALOME_INSTALL_SCRIPT_DATA@")
+SET(SALOME_INSTALL_SCRIPT_PYTHON "@SALOME_INSTALL_SCRIPT_PYTHON@")
+SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "@SALOME_INSTALL_APPLISKEL_SCRIPTS@")
+SET(SALOME_INSTALL_APPLISKEL_PYTHON "@SALOME_INSTALL_APPLISKEL_PYTHON@") 
+SET(SALOME_INSTALL_CMAKE_LOCAL "@SALOME_INSTALL_CMAKE_LOCAL@")
+SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@")
+SET(SALOME_INSTALL_PYTHON_SHARED "@SALOME_INSTALL_PYTHON_SHARED@")
+SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@")
+SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@")
+SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@")
+
+# Include GUI targets if they were not already loaded:
+IF(NOT (TARGET Event)) 
+  INCLUDE("${GUI_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeGUITargets.cmake")
+ENDIF()
+
+# Exposed JOBMANAGER targets:
+SET(JOBMANAGER_BL_Bases BL_Bases)
+SET(JOBMANAGER_BL_Engine BL_Engine)
+SET(JOBMANAGER_BL_GenericGui BL_GenericGui)
+SET(JOBMANAGER_JOBMANAGER JOBMANAGER)
+SET(JOBMANAGER_BL_Wrappers_Qt BL_Wrappers_Qt)
+SET(JOBMANAGER_BL_Wrappers_SALOME BL_Wrappers_SALOME)
+SET(JOBMANAGER_JOBMANAGER_IDL JOBMANAGER_IDL)
\ No newline at end of file
diff --git a/adm_local/CMakeLists.txt b/adm_local/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..84d97c2
--- /dev/null
@@ -0,0 +1,24 @@
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+ADD_SUBDIRECTORY(unix)
+ADD_SUBDIRECTORY(cmake_files)
diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..73b27d8
--- /dev/null
@@ -0,0 +1,28 @@
+# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+# ===============================================================
+# Files to be installed
+# ===============================================================
+
+# These files are data, module or lib files
+SET(_adm_data
+  FindSalomeJOBMANAGER.cmake
+)
+INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL})
diff --git a/adm_local/cmake_files/FindSalomeJOBMANAGER.cmake b/adm_local/cmake_files/FindSalomeJOBMANAGER.cmake
new file mode 100644 (file)
index 0000000..166473e
--- /dev/null
@@ -0,0 +1,31 @@
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#
+
+IF(NOT SalomeJOBMANAGER_FIND_QUIETLY)
+  MESSAGE(STATUS "Looking for Salome JOBMANAGER ...")
+ENDIF()
+
+SET(CMAKE_PREFIX_PATH "${JOBMANAGER_ROOT_DIR}")
+
+SALOME_FIND_PACKAGE(SalomeJOBMANAGER SalomeJOBMANAGER CONFIG)
+
+IF(NOT SalomeJOBMANAGER_FIND_QUIETLY)
+  MESSAGE(STATUS "Found Salome JOBMANAGER: ${JOBMANAGER_ROOT_DIR}")
+ENDIF()
diff --git a/adm_local/unix/CMakeLists.txt b/adm_local/unix/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..2f895ae
--- /dev/null
@@ -0,0 +1,20 @@
+# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+ADD_SUBDIRECTORY(config_files)
diff --git a/adm_local/unix/config_files/CMakeLists.txt b/adm_local/unix/config_files/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..e7fc72e
--- /dev/null
@@ -0,0 +1,36 @@
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(_m4_data
+  ac_cxx_option.m4
+  ac_linker_options.m4
+  acx_pthread.m4
+  check_boost.m4
+  check_omniorb.m4
+  check_salome.m4
+  check_sphinx.m4
+  enable_pthreads.m4
+  i2_check_qt4.m4
+  production.m4
+)
+
+INSTALL(FILES ${_m4_data} DESTINATION ${SALOME_INSTALL_AMCONFIG_LOCAL}/config_files)
diff --git a/adm_local/unix/config_files/ac_cxx_option.m4 b/adm_local/unix/config_files/ac_cxx_option.m4
new file mode 100644 (file)
index 0000000..7da5f02
--- /dev/null
@@ -0,0 +1,43 @@
+dnl Copyright (C) 2009-2013  CEA/DEN, EDF R&D
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+dnl
+dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+dnl
+
+dnl @synopsis AC_CXX_OPTION(-option,variable where we add option if ok,action if ok; action if not ok)
+dnl Check options for C++ compiler
+dnl @author Bernard Secher - 15/01/2004
+dnl
+AC_DEFUN([AC_CXX_OPTION], [
+  AC_MSG_CHECKING(wether $CXX accepts $1)
+  cat > conftest.cxx <<EOF
+int main() { return 0; }
+EOF
+  $CXX -o a.out $1 conftest.cxx > conftest.log 2>&1
+  rm -f a.out
+  var=`echo $1 | sed -e "s, .*$,," | sed -e "s,^-,,"`
+#CCRT  if ! grep -e $var conftest.log > /dev/null 2>&1 ; then
+  if grep -e $var conftest.log > /dev/null 2>&1 ; then
+    AC_MSG_RESULT(no)
+    eval $4
+  else
+    AC_MSG_RESULT(yes)
+    $2="${$2} $1"
+    eval $3
+  fi
+])
+
+
diff --git a/adm_local/unix/config_files/ac_linker_options.m4 b/adm_local/unix/config_files/ac_linker_options.m4
new file mode 100644 (file)
index 0000000..60f2468
--- /dev/null
@@ -0,0 +1,48 @@
+dnl Copyright (C) 2009-2013  CEA/DEN, EDF R&D
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+dnl
+dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+dnl
+
+dnl @synopsis AC_LINKER_OPTIONS
+dnl Check warning flags for C++ compiler to control warning messages
+dnl
+AC_DEFUN([AC_LINKER_OPTIONS],[
+
+  AC_CHECKING(for LIB_LOCATION_SUFFIX)
+  LIB_LOCATION_SUFFIX=""
+  AC_SUBST(LIB_LOCATION_SUFFIX)
+  AC_MSG_RESULT(LIB_LOCATION_SUFFIX is $LIB_LOCATION_SUFFIX)
+
+  for opt in "-Xlinker -export-dynamic" -transitive_link; do
+    AC_CXX_OPTION($opt,LDEXPDYNFLAGS,flag=yes,flag=no)
+    if test "$flag" = "yes"; then
+      break
+    fi
+  done
+  AC_SUBST(LDEXPDYNFLAGS)
+
+dnl 
+  case $host_os in
+    osf*)
+      STDLIB="-lcxxstd"
+      ;;
+    *)
+      STDLIB="-lstdc++"
+      ;;
+  esac
+  AC_SUBST(STDLIB)
+])
diff --git a/adm_local/unix/config_files/acx_pthread.m4 b/adm_local/unix/config_files/acx_pthread.m4
new file mode 100644 (file)
index 0000000..2b22fd9
--- /dev/null
@@ -0,0 +1,224 @@
+dnl Copyright (C) 2009-2013  CEA/DEN, EDF R&D
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+dnl
+dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+dnl
+
+dnl Paul RASCLE: modification for Linux: -pthread required by boost...
+dnl Available from the GNU Autoconf Macro Archive at:
+dnl
+AC_DEFUN([ACX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_SAVE
+AC_LANG_C
+acx_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on True64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+        AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
+        AC_MSG_RESULT($acx_pthread_ok)
+        if test x"$acx_pthread_ok" = xno; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try.  Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important.  Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+#       other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads too;
+#      also defines -D_REENTRANT)
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case "${host_cpu}-${host_os}" in
+        *linux*)
+
+        # On linux "none" works, but boost requires -pthread, so, try first "-pthread"
+acx_pthread_flags="-pthread pthreads none -Kthread -kthread lthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+        ;;
+
+        *solaris*)
+
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed.  (We need to link with -pthread or
+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+        # a function called by this macro, so we could check for that, but
+        # who knows whether they'll stub that too in a future libc.)  So,
+        # we'll just look for -pthreads and -lpthread first:
+
+        acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags"
+        ;;
+esac
+
+if test x"$acx_pthread_ok" = xno; then
+for flag in $acx_pthread_flags; do
+
+        case $flag in
+                none)
+                AC_MSG_CHECKING([whether pthreads work without any flags])
+                ;;
+
+                -*)
+                AC_MSG_CHECKING([whether pthreads work with $flag])
+                PTHREAD_CFLAGS="$flag"
+                ;;
+
+               pthread-config)
+               AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no)
+               if test x"$acx_pthread_config" = xno; then continue; fi
+               PTHREAD_CFLAGS="`pthread-config --cflags`"
+               PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+               ;;
+
+                *)
+                AC_MSG_CHECKING([for the pthreads library -l$flag])
+                PTHREAD_LIBS="-l$flag"
+                ;;
+        esac
+
+        save_LIBS="$LIBS"
+        save_CFLAGS="$CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+        AC_TRY_LINK([#include <pthread.h>],
+                    [pthread_t th; pthread_join(th, 0);
+                     pthread_attr_init(0); pthread_cleanup_push(0, 0);
+                     pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+                    [acx_pthread_ok=yes])
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        AC_MSG_RESULT($acx_pthread_ok)
+        if test "x$acx_pthread_ok" = xyes; then
+                break;
+        fi
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$acx_pthread_ok" = xyes; then
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Detect AIX lossage: threads are created detached by default
+        # and the JOINABLE attribute has a nonstandard name (UNDETACHED).
+        AC_MSG_CHECKING([for joinable pthread attribute])
+        AC_TRY_LINK([#include <pthread.h>],
+                    [int attr=PTHREAD_CREATE_JOINABLE;],
+                    ok=PTHREAD_CREATE_JOINABLE, ok=unknown)
+        if test x"$ok" = xunknown; then
+                AC_TRY_LINK([#include <pthread.h>],
+                            [int attr=PTHREAD_CREATE_UNDETACHED;],
+                            ok=PTHREAD_CREATE_UNDETACHED, ok=unknown)
+        fi
+        if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then
+                AC_DEFINE(PTHREAD_CREATE_JOINABLE, $ok,
+                          [Define to the necessary symbol if this constant
+                           uses a non-standard name on your system.])
+        fi
+        AC_MSG_RESULT(${ok})
+        if test x"$ok" = xunknown; then
+                AC_MSG_WARN([we do not know how to create joinable pthreads])
+        fi
+
+        AC_MSG_CHECKING([if more special flags are required for pthreads])
+        flag=no
+        case "${host_cpu}-${host_os}" in
+                *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
+                *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+        esac
+        AC_MSG_RESULT(${flag})
+        if test "x$flag" != xno; then
+                PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+        fi
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        # More AIX lossage: must compile with cc_r
+        AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC})
+else
+        PTHREAD_CC="$CC"
+fi
+
+AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(PTHREAD_CFLAGS)
+AC_SUBST(PTHREAD_CC)
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$acx_pthread_ok" = xyes; then
+        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
+        :
+else
+        acx_pthread_ok=no
+        $2
+fi
+AC_LANG_RESTORE
+])dnl ACX_PTHREAD
diff --git a/adm_local/unix/config_files/check_boost.m4 b/adm_local/unix/config_files/check_boost.m4
new file mode 100644 (file)
index 0000000..5936e4d
--- /dev/null
@@ -0,0 +1,176 @@
+dnl Copyright (C) 2009-2013  CEA/DEN, EDF R&D
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+dnl
+dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+dnl
+
+AC_DEFUN([CHECK_BOOST],[
+
+AC_CHECKING(for BOOST Library)
+
+AC_REQUIRE([ENABLE_PTHREADS])dnl
+
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+
+gccver=`$CC -dumpversion | sed 's/^\([[0-9]]\+\)\.\([[0-9]]\+\).*/\1\2/g'`
+SUFFIXES="empty -mt -gcc -gcc-mt -gcc${gccver} -gcc${gccver}-mt"
+
+BOOST_CPPFLAGS=""
+BOOST_LIBSUFFIX=""
+BOOST_LIBS=""
+
+AC_CHECKING(for BOOST location)
+AC_ARG_WITH(boost,
+   [AC_HELP_STRING([--with-boost=DIR],[root directory path to BOOST library installation])],
+   [BOOSTDIR="$withval"
+    AC_MSG_RESULT("select $withval as path to BOOST library")
+   ])
+   
+if test "x${BOOSTDIR}" = "x" ; then
+  BOOSTDIR="/usr"
+fi
+
+AC_MSG_RESULT(\$BOOSTDIR = ${BOOSTDIR})
+
+CPPFLAGS_old="${CPPFLAGS}"
+LIBS_old=$LIBS
+
+LIB_SUFFIX="${LIB_LOCATION_SUFFIX}"
+
+if test "x${BOOSTDIR}" != "x" ; then
+  BOOST_CPPFLAGS="-I${BOOSTDIR}/include"
+  BOOST_LIBS="-L${BOOSTDIR}/lib${LIB_SUFFIX}"
+fi
+
+if test "x${BOOSTDIR}" = "x/usr" ; then
+  BOOST_CPPFLAGS=""
+  BOOST_LIBS=""
+fi
+
+boost_ok=no
+boost_headers_ok=no
+boost_binaries_ok=no
+
+dnl BOOST headers
+AC_CHECKING(for BOOST headers)
+CPPFLAGS="${CPPFLAGS_old} ${BOOST_CPPFLAGS}"
+
+boost_include_dir_ok=yes
+if test "x${BOOSTDIR}" != "x" ; then
+  AC_CHECK_FILE(${BOOSTDIR}/include/boost/shared_ptr.hpp,
+                boost_include_dir_ok=yes,
+                boost_include_dir_ok=no)
+fi
+
+BOOST_PROGRAM_OPTIONS_LIB=no
+if test "x${boost_include_dir_ok}" = "xyes" ; then
+  AC_CHECK_FILE(${BOOSTDIR}/include/boost/program_options.hpp,
+                BOOST_PROGRAM_OPTIONS_LIB=yes,
+                BOOST_PROGRAM_OPTIONS_LIB=no)
+fi
+AC_MSG_RESULT(for boost program_options tool: $BOOST_PROGRAM_OPTIONS_LIB)
+
+if test "x${boost_include_dir_ok}" = "xyes" ; then
+  AC_TRY_COMPILE([#include <boost/shared_ptr.hpp>],
+                 [boost::shared_ptr<int>(new int)],
+                 boost_headers_ok=yes,
+                 boost_headers_ok=no)
+fi
+
+if test "x${boost_headers_ok}" = "xno" ; then
+  BOOST_CPPFLAGS="BOOST_CPPFLAGS_NOT_DEFINED"
+else
+  AC_MSG_RESULT(\$BOOST_CPPFLAGS = ${BOOST_CPPFLAGS})
+fi
+AC_MSG_RESULT(for boost headers: $boost_headers_ok)
+
+if test "x${boost_headers_ok}" = "xyes" ; then
+  dnl BOOST binaries
+  AC_CHECKING(for BOOST binaries)
+  boost_lib_dir_ok=yes
+  if test "x${BOOSTDIR}" != "x" ; then
+    for BOOST_LIBSUFFIX in ${SUFFIXES} ; do
+      test "${BOOST_LIBSUFFIX}" == "empty" && BOOST_LIBSUFFIX=""
+      AC_CHECK_FILE([${BOOSTDIR}/lib${LIB_SUFFIX}/libboost_thread${BOOST_LIBSUFFIX}.so],
+                    [boost_lib_dir_ok=yes],
+                    [AC_CHECK_FILE([${BOOSTDIR}/lib64/libboost_thread${BOOST_LIBSUFFIX}.so],
+                                  [boost_lib_dir_ok=yes; LIB_SUFFIX=64],
+                                  [boost_lib_dir_ok=no])
+                    ])
+      if test "x${boost_lib_dir_ok}" = "xyes" ; then
+        break
+      fi
+    done
+  fi
+  if test "x${boost_lib_dir_ok}" = "xyes" ; then
+    LIBS="${LIBS_old} ${BOOST_LIBS} -lboost_thread${BOOST_LIBSUFFIX}"
+    AC_TRY_LINK([#include <boost/thread/thread.hpp>],
+                [struct TBody{ void operator()(){} }; boost::thread(TBody())],
+                boost_binaries_ok=yes,
+                boost_binaries_ok=no)
+    if test "x${boost_binaries_ok}" = "xyes" ; then
+      break
+    fi
+  fi
+fi
+
+if test "x${boost_binaries_ok}" = "xno" ; then
+  BOOST_LIBS="BOOST_LIBS_NOT_FOUND"
+  BOOST_LIBSUFFIX="-not-defined"
+else
+  AC_MSG_RESULT(\$BOOST_LIBSUFFIX = ${BOOST_LIBSUFFIX})
+  AC_MSG_RESULT(\$BOOST_LIBS = ${BOOST_LIBS})
+  AC_CHECK_FILE(${BOOSTDIR}/lib${LIB_SUFFIX}/libboost_thread${BOOST_LIBSUFFIX}.so,
+                BOOST_LIB_THREAD="${BOOST_LIBS} -lboost_thread${BOOST_LIBSUFFIX}",
+                BOOST_LIB_THREAD="")
+  AC_CHECK_FILE(${BOOSTDIR}/lib${LIB_SUFFIX}/libboost_signals${BOOST_LIBSUFFIX}.so,
+                BOOST_LIB_SIGNALS="${BOOST_LIBS} -lboost_signals${BOOST_LIBSUFFIX}",
+                BOOST_LIB_SIGNALS="")
+  AC_CHECK_FILE(${BOOSTDIR}/lib${LIB_SUFFIX}/libboost_system${BOOST_LIBSUFFIX}.so,
+                BOOST_LIB_SYSTEM="${BOOST_LIBS} -lboost_system${BOOST_LIBSUFFIX}",
+                BOOST_LIB_SYSTEM="")
+  AC_CHECK_FILE(${BOOSTDIR}/lib${LIB_SUFFIX}/libboost_regex${BOOST_LIBSUFFIX}.so,
+                BOOST_LIB_REGEX="${BOOST_LIBS} -lboost_regex${BOOST_LIBSUFFIX}",
+                BOOST_LIB_REGEX="")
+fi
+AC_MSG_RESULT(for boost binaries: $boost_binaries_ok)
+
+CPPFLAGS="${CPPFLAGS_old}"
+LIBS="${LIBS_old}"
+
+if test "x${boost_headers_ok}" = "xyes" ; then
+  if test "x${boost_binaries_ok}" = "xyes" ; then
+    boost_ok=yes
+  fi
+fi
+
+AC_MSG_RESULT(for boost: $boost_ok)
+
+AC_SUBST(BOOST_CPPFLAGS)
+AC_SUBST(BOOST_LIBSUFFIX)
+AC_SUBST(BOOST_LIBS)
+AC_SUBST(BOOST_LIB_THREAD)
+AC_SUBST(BOOST_LIB_SIGNALS)
+AC_SUBST(BOOST_LIB_SYSTEM)
+AC_SUBST(BOOST_LIB_REGEX)
+AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB)
+
+AC_LANG_RESTORE
+
+])dnl
+
+
diff --git a/adm_local/unix/config_files/check_omniorb.m4 b/adm_local/unix/config_files/check_omniorb.m4
new file mode 100644 (file)
index 0000000..100187e
--- /dev/null
@@ -0,0 +1,259 @@
+dnl Copyright (C) 2009-2013  CEA/DEN, EDF R&D
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+dnl
+dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+dnl
+AC_DEFUN([AC_CHECK_OMNIORB],[
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_CXX])dnl
+AC_REQUIRE([AC_PROG_CPP])dnl
+AC_REQUIRE([AC_PROG_CXXCPP])dnl
+
+AC_CHECKING(for omniORB)
+omniORB_ok=yes
+
+#VSR: Python is not currently required.
+#Commented to avoid warning message on configure.
+#if test "x$PYTHON" = "x" 
+#then
+#  CHECK_PYTHON
+#fi
+
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+
+AC_PATH_PROG(OMNIORB_IDL, omniidl)
+if test "x$OMNIORB_IDL" = "x"
+then
+  omniORB_ok=no
+  AC_MSG_RESULT(omniORB binaries not in PATH variable)
+else
+  omniORB_ok=yes
+fi
+
+if  test "x$omniORB_ok" = "xyes"
+then
+  AC_SUBST(OMNIORB_IDL)
+
+  OMNIORB_BIN=`echo ${OMNIORB_IDL} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
+  OMNIORB_ROOT=${OMNIORB_BIN}
+  # one-level up
+  OMNIORB_ROOT=`echo ${OMNIORB_ROOT}  | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
+  #
+  #
+  if test -d $OMNIORB_ROOT/include ; then
+    # if $OMNIORB_ROOT/include exists, there are a lot of chance that
+    # this is omniORB4.x installed via configure && make && make install
+    OMNIORB_LIB=`echo ${OMNIORB_BIN} | sed -e "s,bin\$,lib,"`
+    OMNIORB_VERSION=4
+  else
+    # omniORB has been installed old way
+    OMNIORB_LIB=`echo ${OMNIORB_BIN} | sed -e "s,bin/,lib/,"`
+    # one-level up again
+    OMNIORB_ROOT=`echo ${OMNIORB_ROOT}  | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
+    if test -d $OMNIORB_ROOT/include/omniORB4 ; then
+      OMNIORB_VERSION=4
+    else
+      OMNIORB_VERSION=3
+    fi
+  fi
+  AC_SUBST(OMNIORB_ROOT)
+
+  OMNIORB_INCLUDES="-I$OMNIORB_ROOT/include -I$OMNIORB_ROOT/include/omniORB${OMNIORB_VERSION} -I$OMNIORB_ROOT/include/COS"
+  AC_SUBST(OMNIORB_INCLUDES)
+
+  # ENABLE_PTHREADS
+
+  OMNIORB_CXXFLAGS="-DOMNIORB_VERSION=$OMNIORB_VERSION"
+  case $build_cpu in
+    sparc*)
+      OMNIORB_CXXFLAGS="$OMNIORB_CXXFLAGS -D__sparc__"
+      ;;
+   *86*)
+      OMNIORB_CXXFLAGS="$OMNIORB_CXXFLAGS -D__x86__"
+      ;;
+  esac
+  case $build_os in
+    solaris*)
+      __OSVERSION__=5
+      OMNIORB_CXXFLAGS="$OMNIORB_CXXFLAGS -D__sunos__"
+      ;;
+   linux*)
+      __OSVERSION__=2
+      OMNIORB_CXXFLAGS="$OMNIORB_CXXFLAGS -D__linux__ -D_REENTRANT"
+      ;;
+  esac
+  AC_SUBST(OMNIORB_CXXFLAGS)
+
+  CPPFLAGS_old=$CPPFLAGS
+  CPPFLAGS="$CPPFLAGS $OMNIORB_CXXFLAGS $OMNIORB_INCLUDES"
+
+  AC_LANG_CPLUSPLUS
+  AC_CHECK_HEADER(CORBA.h,omniORB_ok="yes",omniORB_ok="no")
+
+  CPPFLAGS=$CPPFLAGS_old
+
+fi
+
+if test "x$omniORB_ok" = "xyes" 
+then
+  if test "x$OMNIORB_LIB" = "x/usr/lib"
+  then
+    OMNIORB_LDFLAGS=""
+    OMNIORB_RFLAGS=""
+  else
+    OMNIORB_LDFLAGS="-L$OMNIORB_LIB"
+    OMNIORB_RFLAGS="-R$OMNIORB_LIB"
+  fi
+
+  LIBS_old=$LIBS
+  LIBS="$LIBS $OMNIORB_LDFLAGS -lomnithread"
+
+  CXXFLAGS_old=$CXXFLAGS
+  CXXFLAGS="$CXXFLAGS $OMNIORB_CXXFLAGS $OMNIORB_INCLUDES"
+
+  AC_MSG_CHECKING(whether we can link with omnithreads)
+  AC_CACHE_VAL(salome_cv_lib_omnithreads,[
+    AC_TRY_LINK(
+#include <omnithread.h>
+,   omni_mutex my_mutex,
+    eval "salome_cv_lib_omnithreads=yes",eval "salome_cv_lib_omnithreads=no")
+  ])
+
+  omniORB_ok="$salome_cv_lib_omnithreads"
+  if  test "x$omniORB_ok" = "xno"
+  then
+    AC_MSG_RESULT(omnithreads not found)
+  else
+    AC_MSG_RESULT(yes)
+  fi
+
+  LIBS=$LIBS_old
+  CXXFLAGS=$CXXFLAGS_old
+fi
+
+
+dnl omniORB_ok=yes
+if test "x$omniORB_ok" = "xyes" 
+then
+
+  AC_CHECK_LIB(socket,socket, LIBS="-lsocket $LIBS",,)
+  AC_CHECK_LIB(nsl,gethostbyname, LIBS="-lnsl $LIBS",,)
+
+  LIBS_old=$LIBS
+  OMNIORB_LIBS="$OMNIORB_LDFLAGS"
+  OMNIORB_LIBS="$OMNIORB_LIBS -lomniORB${OMNIORB_VERSION}"
+  OMNIORB_LIBS="$OMNIORB_LIBS -lomniDynamic${OMNIORB_VERSION}"
+  OMNIORB_LIBS="$OMNIORB_LIBS -lCOS${OMNIORB_VERSION}"
+  OMNIORB_LIBS="$OMNIORB_LIBS -lCOSDynamic${OMNIORB_VERSION}"
+  OMNIORB_LIBS="$OMNIORB_LIBS -lomnithread"
+  OMNIORB_LIBS="$OMNIORB_LIBS ${OMNIORB_RFLAGS}"
+  if test $OMNIORB_VERSION = 3 ; then
+    OMNIORB_LIBS="$OMNIORB_LIBS -ltcpwrapGK"
+  fi
+  AC_SUBST(OMNIORB_LIBS)
+
+  LIBS="$OMNIORB_LIBS $LIBS"
+  CXXFLAGS_old=$CXXFLAGS
+  CXXFLAGS="$CXXFLAGS $OMNIORB_CXXFLAGS $OMNIORB_INCLUDES"
+
+  AC_MSG_CHECKING(whether we can link with omniORB)
+  AC_CACHE_VAL(salome_cv_lib_omniorb,[
+    AC_TRY_LINK(
+#include <CORBA.h>
+,   CORBA::ORB_var orb,
+    eval "salome_cv_lib_omniorb3=yes",eval "salome_cv_lib_omniorb3=no")
+  ])
+  omniORB_ok="$salome_cv_lib_omniorb3"
+
+  omniORB_ok=yes
+  if test "x$omniORB_ok" = "xno" 
+  then
+    AC_MSG_RESULT(omniORB library linking failed)
+    omniORB_ok=no
+  else
+    AC_MSG_RESULT(yes)
+  fi
+  LIBS="$LIBS_old"
+  CXXFLAGS=$CXXFLAGS_old
+fi
+
+
+if test "x$omniORB_ok" = "xyes" 
+then
+
+  OMNIORB_IDLCXXFLAGS="-nf -I$OMNIORB_ROOT/idl"
+  OMNIORB_IDLPYFLAGS="-bpython -I$OMNIORB_ROOT/idl"
+  AC_SUBST(OMNIORB_IDLCXXFLAGS)
+  AC_SUBST(OMNIORB_IDLPYFLAGS)
+
+  OMNIORB_IDL_CLN_H=.hh
+  OMNIORB_IDL_CLN_CXX=SK.cc
+  OMNIORB_IDL_CLN_OBJ=SK.o 
+  AC_SUBST(OMNIORB_IDL_CLN_H)
+  AC_SUBST(OMNIORB_IDL_CLN_CXX)
+  AC_SUBST(OMNIORB_IDL_CLN_OBJ)
+
+  OMNIORB_IDL_SRV_H=.hh
+  OMNIORB_IDL_SRV_CXX=SK.cc
+  OMNIORB_IDL_SRV_OBJ=SK.o
+  AC_SUBST(OMNIORB_IDL_SRV_H)
+  AC_SUBST(OMNIORB_IDL_SRV_CXX)
+  AC_SUBST(OMNIORB_IDL_SRV_OBJ)
+
+  OMNIORB_IDL_TIE_H=
+  OMNIORB_IDL_TIE_CXX=
+  AC_SUBST(OMNIORB_IDL_TIE_H)
+  AC_SUBST(OMNIORB_IDL_TIE_CXX)
+  
+  AC_DEFINE(OMNIORB,,[Presence de omniORB])
+
+  CORBA_HAVE_POA=1
+  AC_DEFINE(CORBA_HAVE_POA,,[POA presence])
+
+  CORBA_ORB_INIT_HAVE_3_ARGS=1
+  AC_DEFINE(CORBA_ORB_INIT_HAVE_3_ARGS,,[?])
+  CORBA_ORB_INIT_THIRD_ARG='"omniORB"'
+  AC_DEFINE(CORBA_ORB_INIT_THIRD_ARG, "omniORB", [?])
+
+fi
+
+omniORBpy_ok=no
+if  test "x$omniORB_ok" = "xyes"
+then
+  AC_MSG_CHECKING(omniORBpy)
+  $PYTHON -c "import omniORB" &> /dev/null
+  if test $? = 0 ; then
+    AC_MSG_RESULT(yes)
+    omniORBpy_ok=yes
+  else
+    AC_MSG_RESULT(no, check your installation of omniORBpy)
+    omniORBpy_ok=no
+  fi
+fi
+
+dnl AC_LANG_RESTORE
+
+AC_MSG_RESULT(for omniORBpy: $omniORBpy_ok)
+AC_MSG_RESULT(for omniORB: $omniORB_ok)
+
+IDL=${OMNIORB_IDL}
+IDLGENFLAGS="-bcxx "
+AC_SUBST(IDL)  
+AC_SUBST(IDLGENFLAGS)  
+
+])dnl
+dnl
diff --git a/adm_local/unix/config_files/check_salome.m4 b/adm_local/unix/config_files/check_salome.m4
new file mode 100644 (file)
index 0000000..103c2d9
--- /dev/null
@@ -0,0 +1,164 @@
+dnl Copyright (C) 2009-2013  CEA/DEN, EDF R&D
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+dnl
+dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+dnl
+# Check availability of Salome's KERNEL binary distribution
+#
+# Author : Jerome Roy (CEA, 2003)
+#
+
+AC_DEFUN([AC_CHECK_KERNEL],[
+
+AC_CHECKING(for Kernel)
+
+Kernel_ok=no
+dsc_ok=no
+
+AC_ARG_WITH(kernel,
+            [  --with-kernel=DIR               root directory path of KERNEL build or installation],
+            KERNEL_DIR="$withval",KERNEL_DIR="")
+
+if test "x$KERNEL_DIR" = "x" ; then
+
+# no --with-kernel-dir option used
+
+   if test "x$KERNEL_ROOT_DIR" != "x" ; then
+
+    # KERNEL_ROOT_DIR environment variable defined
+      KERNEL_DIR=$KERNEL_ROOT_DIR
+
+   else
+
+    # search Kernel binaries in PATH variable
+      AC_PATH_PROG(TEMP, runSalome.py)
+      if test "x$TEMP" != "x" ; then
+         KERNEL_BIN_DIR=`dirname $TEMP`
+         KERNEL_DIR=`dirname $KERNEL_BIN_DIR`
+      fi
+
+   fi
+#
+fi
+
+
+if test -f ${KERNEL_DIR}/bin/salome/runSalome.py ; then
+   Kernel_ok=yes
+   AC_MSG_RESULT(Using Kernel module distribution in ${KERNEL_DIR})
+   AC_DEFINE(SALOME_KERNEL,,[With Salome KERNEL])
+
+   if test "x$KERNEL_ROOT_DIR" = "x" ; then
+      KERNEL_ROOT_DIR=${KERNEL_DIR}
+   fi
+   if test "x$KERNEL_SITE_DIR" = "x" ; then
+      KERNEL_SITE_DIR=${KERNEL_ROOT_DIR}
+   fi
+   SALOME_ROOT_DIR=`AS_DIRNAME(["$KERNEL_ROOT_DIR"])`
+   SALOME_VERSION="`echo $KERNEL_ROOT_DIR | sed s@$SALOME_ROOT_DIR/KERNEL@@`"
+
+   if test -f ${KERNEL_DIR}/idl/salome/DSC_Engines.idl ; then
+      # DSC extension available
+      dsc_ok=yes
+      AC_MSG_RESULT(Using DSC Ports module distribution in ${KERNEL_DIR})
+      AC_DEFINE(DSC_PORTS,,[With DSC ports])
+   else
+      AC_MSG_WARN("Cannot find DSC Ports module distribution")
+   fi
+
+   KERNEL_LDFLAGS=-L${KERNEL_ROOT_DIR}/lib/salome
+   KERNEL_CXXFLAGS=-I${KERNEL_ROOT_DIR}/include/salome
+
+   AC_SUBST(KERNEL_ROOT_DIR)
+   AC_SUBST(KERNEL_SITE_DIR)
+   AC_SUBST(SALOME_ROOT_DIR)
+   AC_SUBST(SALOME_VERSION)
+   AC_SUBST(KERNEL_LDFLAGS)
+   AC_SUBST(KERNEL_CXXFLAGS)
+
+else
+   AC_MSG_WARN("Cannot find compiled Kernel module distribution")
+fi
+
+AC_MSG_RESULT(for Kernel: $Kernel_ok)
+
+])dnl
+
+# -----------------------------------------------------------------------------
+# --- from GUI_SRC 3.2.3
+#  Check availability of Salome binary distribution
+#
+#  Author : Marc Tajchman (CEA, 2002)
+#------------------------------------------------------------
+
+AC_DEFUN([CHECK_GUI],[
+AC_REQUIRE([AC_LINKER_OPTIONS])dnl
+
+AC_CHECKING(for $2 $1 )
+
+SalomeGUI_ok=no
+
+GUI_LDFLAGS=""
+GUI_CXXFLAGS=""
+
+AC_ARG_WITH(gui,
+            [  --with-gui=DIR          root directory path of SALOME GUI installation],
+            [SALOME_GUI_DIR="$withval"],[SALOME_GUI_DIR=""])
+
+if test "x${SALOME_GUI_DIR}" = "x" ; then
+  # no --with-gui-dir option used
+  AC_MSG_RESULT(try \${GUI_ROOT_DIR}: ${GUI_ROOT_DIR})
+  if test "x${GUI_ROOT_DIR}" != "x" ; then
+    # SALOME_ROOT_DIR environment variable defined
+    SALOME_GUI_DIR=${GUI_ROOT_DIR}
+  else
+    # search Salome binaries in PATH variable
+    AC_PATH_PROG(TEMP, $1)
+    if test "x${TEMP}" != "x" ; then
+      AC_MSG_RESULT($1 was found at : ${TEMP})
+      SALOME_BIN_DIR=`dirname ${TEMP}`
+      SALOME_GUI_DIR=`cd ${SALOME_BIN_DIR}/../..; pwd`
+    fi
+  fi
+fi
+
+if test -f ${SALOME_GUI_DIR}/bin/salome/$1 ; then
+  SalomeGUI_ok=yes
+  AC_MSG_RESULT(Using SALOME GUI distribution in ${SALOME_GUI_DIR})
+
+  if test "x${GUI_ROOT_DIR}" == "x" ; then
+    GUI_ROOT_DIR=${SALOME_GUI_DIR}
+  fi
+
+  AC_SUBST(GUI_ROOT_DIR)
+
+  GUI_LDFLAGS=-L${SALOME_GUI_DIR}/lib/salome
+  GUI_CXXFLAGS=-I${SALOME_GUI_DIR}/include/salome
+
+  AC_SUBST(GUI_LDFLAGS)
+  AC_SUBST(GUI_CXXFLAGS)
+else
+  AC_MSG_WARN("Cannot find compiled SALOME GUI distribution")
+fi
+
+AC_MSG_RESULT(for $2: ${SalomeGUI_ok})
+
+])dnl
+
+AC_DEFUN([CHECK_SALOME_GUI],[
+  CHECK_GUI([SUITApp],
+            [SALOME GUI])
+])dnl
+
diff --git a/adm_local/unix/config_files/check_sphinx.m4 b/adm_local/unix/config_files/check_sphinx.m4
new file mode 100644 (file)
index 0000000..96f8120
--- /dev/null
@@ -0,0 +1,35 @@
+dnl Copyright (C) 2009-2013  CEA/DEN, EDF R&D
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+dnl
+dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+dnl
+AC_DEFUN([CHECK_SPHINX],[
+
+AC_CHECKING(for sphinx doc generator)
+
+sphinx_ok=yes
+dnl where is sphinx ?
+AC_PATH_PROG(SPHINX,sphinx-build) 
+if test "x$SPHINX" = "x"
+then
+  AC_MSG_WARN(sphinx not found)
+  sphinx_ok=no
+fi
+
+AM_CONDITIONAL(SPHINX_IS_OK, [test x"$sphinx_ok" = xyes])
+
+])dnl
+dnl
diff --git a/adm_local/unix/config_files/enable_pthreads.m4 b/adm_local/unix/config_files/enable_pthreads.m4
new file mode 100644 (file)
index 0000000..c7325cc
--- /dev/null
@@ -0,0 +1,21 @@
+dnl modify CFLAGS, CXXFLAGS and LIBS for compiling pthread-based programs.
+dnl@author  (C) Ruslan Shevchenko <Ruslan@Shevchenko.Kiev.UA>, 1998, 2000
+dnl@id  $Id$
+dnl Modified to use acx_pthread.m4 from GNU Autoconf Macro Archive
+dnl
+AC_DEFUN([ENABLE_PTHREADS],[
+AC_REQUIRE([ACX_PTHREAD])
+
+if test x"$enable_pthreads_done" != xyes; then
+  if test x"$acx_pthread_ok" = xyes; then
+    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
+    LIBS="$LIBS $PTHREAD_LIBS"
+    threads_ok=yes
+  else
+    threads_ok=no
+  fi
+  enable_pthreads_done=yes
+fi
+])dnl
+dnl
diff --git a/adm_local/unix/config_files/i2_check_qt4.m4 b/adm_local/unix/config_files/i2_check_qt4.m4
new file mode 100644 (file)
index 0000000..cacaba7
--- /dev/null
@@ -0,0 +1,446 @@
+dnl Copyright (C) 2009-2013  CEA/DEN, EDF R&D
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+dnl
+dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+dnl
+
+dnl the following variables are exported:
+dnl  QT_MOC
+dnl  QT_UIC
+dnl  QT_DIR
+dnl  qt4_cppflags
+dnl  qt4_ldflags
+dnl  qt4_libs
+dnl  WITH_QT4
+dnl qt4 is searched in the following order
+dnl   path given with --with-qt4 options
+dnl   presence of QTDIR variable
+dnl   /usr
+dnl when HAS_GUI is false (no salome gui) and nothing is said for qt4, qt4 is not checked
+dnl usages
+dnl ./configure --prefix=/home/prascle/partage/maquettes/install 
+dnl ./configure --prefix=/home/prascle/partage/maquettes/install --with-qt4
+dnl ./configure --prefix=/home/prascle/partage/maquettes/install --with-qt4=/opt/qt443
+dnl ./configure --prefix=/home/prascle/partage/maquettes/install --with-qt4-includes=/usr/include/qt4
+dnl ./configure --prefix=/home/prascle/partage/maquettes/install --with-qt4-includes=/usr/include/qt4 --with-qt4-libraries=/usr/lib -with-qt4-tools=/usr/bin
+dnl ./configure --prefix=/home/prascle/partage/maquettes/install --without-qt4
+dnl
+AC_DEFUN([I2_CHECK_QT4],
+[
+  AC_REQUIRE([AC_PROG_CXX])
+  AC_REQUIRE([AC_PROG_CPP])
+
+  qt_ok=no
+  qt4_wanted=yes
+  WITH_QT4=0
+
+  # --- check if qt4 standard install directory is defined (with subdirectories bin lib include)
+  qt4_install_path=""
+  AC_ARG_WITH([qt4],
+    AC_HELP_STRING([--with-qt4@<:@=DIR@:>@], [where the Qt4 package with a standard install is: default @<:@$QTDIR@:>@ or @<:@/usr@:>@]),
+                 [qt4_install_path=$withval], [withval=notset])
+
+  # --- if qt4 standard install directory is defined but with no path: QTDIR value if defined, or /usr
+  if test x${withval} = xyes
+  then
+    if test -z $QTDIR
+    then
+      qt4_install_path="/usr"
+    else
+      qt4_install_path=$QTDIR
+    fi
+  fi
+
+  # --- if qt4 standard install directory is not defined
+  #       if HAS_GUI= 0: Qt4 not wanted
+  #       else: QTDIR value if defined, or /usr
+  if test x${withval} = xnotset
+  then
+    if test x${HAS_GUI} = x0
+    then
+      qt4_wanted=no
+      AC_MSG_NOTICE([SALOME GUI not present, Qt4 not specified, skip detection])
+    else
+      if test -z $QTDIR
+      then
+        qt4_install_path="/usr"
+      else
+        if test $QTDIR = /usr/lib/qt3 ; then
+          if test -d /usr/lib/qt4 ; then
+            AC_MSG_RESULT(it is strange for a qt4 installation !)
+            AC_MSG_RESULT(/usr/lib/qt4 is present)
+            AC_MSG_RESULT(replacing QTDIR by /usr/lib/qt4)
+            QTDIR=/usr/lib/qt4
+          fi
+        fi
+        qt4_install_path=$QTDIR
+      fi
+    fi
+  fi
+  
+  # --- if qt4 standard install directory is not wanted: --without-qt4 or --with-qt4=no
+  if test x${withval} = xno
+  then
+    qt4_wanted=no
+    AC_MSG_NOTICE([Qt4 is not wanted, skip detection])
+  fi
+
+  QT_DIR=${qt4_install_path}
+  AC_SUBST(QT_DIR)
+
+  # ----------------------------------------------------------------------
+  # --- only when qt4 wanted (no explicit --without-qt4 nor --with-qt4=no)
+
+  if test x${qt4_wanted} = xyes
+  then
+
+  # --- check if qt4 includes directory is defined
+  qt4_include_path=""
+  AC_ARG_WITH([qt4-includes],
+    AC_HELP_STRING([--with-qt4-includes@<:@=DIR@:>@], [where the Qt4 includes are: default @<:@$QTDIR/include@:>@ or @<:@/usr/include@:>@]),
+                 [qt4_include_path=$withval], [withval=no])
+  if test x${withval} != xno
+  then
+    # --- qt4 includes directory is defined
+    if test x${qt4_include_path} = xyes
+    then
+      qt4_include_path="/usr/include"
+    fi
+  else
+    if test x${qt4_install_path} != x
+    then
+      qt4_include_path="${qt4_install_path}/include"
+    fi
+  fi
+
+
+  # --- check if qt4 libraries directory is defined
+  qt4_library_path=""
+  AC_ARG_WITH([qt4-libraries],
+    AC_HELP_STRING([--with-qt4-libraries@<:@=DIR@:>@], [where the Qt4 libraries are: default @<:@$QTDIR/lib@:>@ or @<:@/usr/lib@:>@]),
+                 [qt4_library_path=$withval], [withval=no])
+  if test x${withval} != xno
+  then
+    # --- qt4 libraries directory is defined
+    if test x${qt4_library_path} = xyes
+    then
+      qt4_library_path="/usr/lib"
+    fi
+  else
+    if test x${qt4_install_path} != x
+    then
+      qt4_library_path="${qt4_install_path}/lib"
+    fi
+  fi
+
+  # --- check if qt4 tools directory is defined
+  qt4_tools_path=""
+  AC_ARG_WITH([qt4-tools],
+    AC_HELP_STRING([--with-qt4-tools@<:@=DIR@:>@], [where the Qt4 executable tools are: default @<:@$QTDIR/bin@:>@ or @<:@/usr/bin@:>@]),
+                 [qt4_tools_path=$withval], [withval=no])
+  if test x${withval} != xno
+  then
+    # --- qt4 tools directory is defined
+    if test x${qt4_tools_path} = xyes
+    then
+      qt4_tools_path="/usr/bin"
+    fi
+  else
+    if test x${qt4_install_path} != x
+    then
+      qt4_tools_path="${qt4_install_path}/bin"
+    fi
+  fi
+
+
+  # test if qt4 is completely defined
+  qt4_defined=yes
+  if test x${qt4_include_path} = x
+  then
+    qt4_defined=no
+    AC_MSG_NOTICE([No Qt4 include path defined])
+  else
+    AC_MSG_NOTICE([Qt4 include path is ${qt4_include_path}])
+  fi
+  if test x${qt4_library_path} = x
+  then
+    qt4_defined=no
+    AC_MSG_NOTICE([No Qt4 library path defined])
+  else
+    AC_MSG_NOTICE([Qt4 library path is ${qt4_library_path}])
+  fi
+  if test x${qt4_tools_path} = x
+  then
+    qt4_defined=no
+    AC_MSG_NOTICE([No Qt4 tools path defined])
+  else
+    AC_MSG_NOTICE([Qt4 tools   path is ${qt4_tools_path}])
+  fi
+
+  # saving values for compilation variables
+  saved_CPPFLAGS=$CPPFLAGS
+  saved_LDFLAGS=$LDFLAGS
+  saved_LIBS=$LIBS
+
+  if ! test x${qt4_defined} = xno
+  then
+    # ask for qt4 support
+    AC_MSG_NOTICE([checking whether qt4 tools and headers are present])
+
+    # --- we test the presence of moc,first under the form moc-qt4, then moc
+    AC_PATH_PROGS(qt4_moc_found, [moc-qt4 moc], no, ${qt4_tools_path})
+    test x${qt4_moc_found} = xno && AC_MSG_ERROR([Qt4 moc command NOT FOUND])
+    QT_MOC=$qt4_moc_found
+    AC_SUBST(QT_MOC)
+
+    # --- we test the presence of uic,first under the form uic-qt4, then uic
+    AC_PATH_PROGS(qt4_uic_found, [uic-qt4 uic], no, ${qt4_tools_path})
+    test x${qt4_uic_found} = xno && AC_MSG_ERROR([Qt4 uic command NOT FOUND])
+    QT_UIC=$qt4_uic_found
+    AC_SUBST(QT_UIC)
+
+    # --- we test the presence of rcc,first under the form rcc-qt4, then rcc
+    AC_PATH_PROGS(qt4_rcc_found, [rcc-qt4 rcc], no, ${qt4_tools_path})
+    test x${qt4_rcc_found} = xno && AC_MSG_ERROR([Qt4 rcc command NOT FOUND])
+    QT_RCC=$qt4_rcc_found
+    AC_SUBST(QT_RCC)
+
+    # --- we test the header file presence and usability
+    QTINC=""
+    AC_CHECK_FILE($qt4_include_path/qt4/QtCore/qglobal.h,QTINC="/qt4",QTINC="")
+    qt4_include_path="$qt4_include_path${QTINC}"
+    qt4_cppflags=""
+    qt4_cppflags="${qt4_cppflags} -I$qt4_include_path/QtCore"
+    qt4_cppflags="${qt4_cppflags} -I$qt4_include_path/QtGui"
+    qt4_cppflags="${qt4_cppflags} -I$qt4_include_path/Qt"
+    qt4_cppflags="${qt4_cppflags} -I$qt4_include_path"
+    CPPFLAGS="${CPPFLAGS} ${qt4_cppflags}"
+    AC_LANG_PUSH(C++)
+    AC_CHECK_HEADERS([qapplication.h],
+                     [qt4_header_found=yes],
+                     [qt4_header_found=no],
+                     [])
+    AC_LANG_POP(C++)
+    test x${qt4_header_found} = xno && AC_MSG_ERROR([Qt4 include file NOT FOUND])
+    AC_SUBST(qt4_cppflags)
+
+    # --- we test the library file presence and usability
+    if test x${qt4_library_path} = x/usr/lib
+    then
+      qt4_ldflags=""
+    else
+      qt4_ldflags="-L$qt4_library_path"
+    fi
+
+    AC_MSG_NOTICE([checking whether link with qt4 is working])
+    qt4_libs="-lQtCore -lQtGui"
+    LDFLAGS="${LDFLAGS} ${qt4_ldflags}"
+    LIBS="${LIBS} ${qt4_libs}"
+    AC_LANG_PUSH(C++)
+
+    AC_LINK_IFELSE([AC_LANG_PROGRAM(
+    [[ #include <QApplication>
+       #include <QPushButton> ]],
+    [[ QApplication app(0, 0);
+       QPushButton hello("Hello world!");
+       hello.resize(100, 30);
+       hello.show(); ]] )],
+    [qt4_lib_found=yes], [qt4_lib_found=no] )
+
+    test x${qt4_lib_found} = xno && AC_MSG_ERROR([Qt4 library NOT FOUND])
+
+    AC_LANG_POP(C++)
+    AC_SUBST(qt4_ldflags)
+    AC_SUBST(qt4_libs)
+
+    # --- after all tests are successful, we support Qt4
+    WITH_QT4=1
+    qt_ok=yes
+    AC_MSG_NOTICE([Qt4 support is OK])
+
+  else
+    # --- no Qt4 support
+    AC_MSG_NOTICE([No Qt4 support])
+  fi
+
+  # restoring saved values
+  CPPFLAGS=$saved_CPPFLAGS
+  LDFLAGS=$saved_LDFLAGS
+  LIBS=$saved_LIBS
+
+  fi
+  # --- end: only when qt4 wanted (no explicit --without-qt4 nor --with-qt4=no)
+  # ----------------------------------------------------------------------
+
+  # Propagate test into atlocal
+  AC_SUBST(WITH_QT4)
+
+  # Propagate test into Makefiles...
+  AM_CONDITIONAL(WITH_QT4, test $WITH_QT4 = 1)
+
+  # ... and into source files
+  AC_DEFINE_UNQUOTED(HAS_QT4, $WITH_QT4, [Qt4 library])
+
+])
+
+
+AC_DEFUN([I2_CHECK_QSCINTILLA],
+[
+  AC_REQUIRE([I2_CHECK_QT4])
+  qscintilla_ok=no
+  WITH_QSCI4=0
+
+  # ----------------------------------------------------------------------
+  # --- check qscintilla only when qt4 OK
+
+  if test x${WITH_QT4} = x1
+  then
+
+  # --- check if qsci4 includes directory is defined
+  qsci4_include_path=""
+  qsci4_cppflags=""
+
+  AC_ARG_WITH([qsci4-includes],
+    AC_HELP_STRING([--with-qsci4-includes@<:@=DIR@:>@], [where the Qsci4 includes are: default @<:@$QTDIR/include/Qsci@:>@ or @<:@/usr/include/Qsci@:>@]),
+              [qsci4_include_path=$withval])
+
+  if test x${qsci4_include_path} = x ; then
+    # --- "" --- try to use QSCINTILLA_DIR/include/Qsci
+    if test "x${QSCINTILLA_DIR}" != "x" ; then
+      qsci4_include_path="${QSCINTILLA_DIR}/include"
+    else
+      qsci4_include_path=no
+    fi
+  fi
+
+  if test x${qsci4_include_path} = xno ; then
+    # --- "no" --- no native installation, try to find in Qt
+    qsci4_include_path="${QT_DIR}/include${QTINC}/Qsci"
+    qsci4_cppflags=" -I$qsci4_include_path"
+    # " -I${QT_DIR}/include${QTINC}" is included in qt4_cppflags
+  else
+    if test x${qsci4_include_path} = xyes ; then
+      # --- "yes" --- try to find in /usr/include/Qsci
+      qsci4_include_path="/usr/include${QTINC}/Qsci"
+      qsci4_cppflags=" -I$qsci4_include_path"
+      # " -I/usr/include${QTINC}" is included in qt4_cppflags or by default (if QTINC is empty)
+    else
+      # --- "other" --- try to find in given dir
+      qsci4_cppflags=" -I$qsci4_include_path/Qsci -I$qsci4_include_path"
+    fi
+  fi
+
+  AC_MSG_NOTICE($qsci4_cppflags)
+
+  # --- check if qsci4 libraries directory is defined
+  qsci4_library_path=""
+
+  AC_ARG_WITH([qsci4-libraries],
+    AC_HELP_STRING([--with-qsci4-libraries@<:@=DIR@:>@], [where the Qsci4 libraries are: default @<:@$QTDIR/lib@:>@ or @<:@/usr/lib@:>@]),
+              [qsci4_library_path=$withval])
+
+  if test x${qsci4_library_path} = x ; then
+    # --- "" --- try to use QSCINTILLA_DIR/lib
+    if test "x${QSCINTILLA_DIR}" != "x" ; then
+      qsci4_library_path="${QSCINTILLA_DIR}/lib"
+    else
+      qsci4_library_path=no
+    fi
+  fi
+
+  if test x${qsci4_library_path} = xno ; then
+    # --- "no" --- no native installation, try to find in Qt
+    qsci4_library_path="${QT_DIR}/lib"
+  else
+    if test x${qsci4_library_path} = xyes ; then
+      # --- "yes" --- try to find in /usr/lib
+      qsci4_library_path="/usr/lib"
+    fi
+  fi
+
+  AC_MSG_NOTICE($qsci4_library_path)
+
+  # saving values for compilation variables
+  saved_CPPFLAGS=$CPPFLAGS
+  saved_LDFLAGS=$LDFLAGS
+  saved_LIBS=$LIBS
+
+  # ask for qsci4 support
+  AC_MSG_NOTICE([checking whether qscintilla for qt4 headers are present])
+
+  # --- we test the header file presence and usability
+  CPPFLAGS="${CPPFLAGS} ${qsci4_cppflags} ${qt4_cppflags}"
+  AC_LANG_PUSH(C++)
+  AC_CHECK_HEADERS([qsciscintilla.h],
+                   [qsci4_header_found=yes],
+                   [qsci4_header_found=no],
+                   [])
+  AC_LANG_POP(C++)
+  if test x${qsci4_header_found} = xyes
+  then
+    AC_SUBST(qsci4_cppflags)
+
+    # --- we test the library file presence and usability
+    if test x${qsci4_library_path} = x/usr/lib/qt4/lib
+    then
+      qsci4_library_path=/usr/lib
+    fi
+    if test x${qsci4_library_path} = x/usr/lib
+    then
+      qsci4_ldflags=""
+    else
+      qsci4_ldflags="-L$qsci4_library_path"
+    fi
+
+    AC_MSG_NOTICE([checking whether qscintilla2 library is present])
+    qsci4_libs=-lqscintilla2
+    AC_CHECK_FILE([${qsci4_library_path}/libqscintilla2.so],
+                   [qsci4_library_found=yes],
+                   [qsci4_library_found=no])
+    if test x${qsci4_library_found} = xyes
+    then
+      AC_MSG_NOTICE([qscintilla for qt4 support])
+      AC_SUBST(qsci4_ldflags)
+      AC_SUBST(qsci4_libs)
+      WITH_QSCI4=1
+      qscintilla_ok=yes
+    fi
+
+  else
+    AC_MSG_NOTICE([no support for qscintilla for qt4])
+  fi
+
+  # restoring saved values
+  CPPFLAGS=$saved_CPPFLAGS
+  LDFLAGS=$saved_LDFLAGS
+  LIBS=$saved_LIBS
+
+  else
+  # --- end: check qscintilla only when qt4 OK
+  # ----------------------------------------------------------------------
+    AC_MSG_NOTICE([qscintilla for qt4 not checked because Qt4 not wanted or not detected])
+  fi
+
+  # Propagate test into atlocal
+  AC_SUBST(WITH_QSCI4)
+  
+  # Propagate test into Makefiles...
+  AM_CONDITIONAL(WITH_QSCI4, test $WITH_QSCI4 = 1)
+
+  # ... and into source files
+  AC_DEFINE_UNQUOTED(HAS_QSCI4, $WITH_QSCI4, [QsciScintilla library])
+
+])
diff --git a/adm_local/unix/config_files/production.m4 b/adm_local/unix/config_files/production.m4
new file mode 100644 (file)
index 0000000..c47164c
--- /dev/null
@@ -0,0 +1,102 @@
+dnl Copyright (C) 2009-2013  CEA/DEN, EDF R&D
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+dnl
+dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+dnl
+
+dnl define macros :
+dnl AC_ENABLE_PRODUCTION AC_DISABLE_PRODUCTION
+dnl AC_ENABLE_DEBUG AC_DISABLE_DEBUG
+dnl version $Id$
+dnl author Patrick GOLDBRONN
+dnl
+# AC_ENABLE_PRODUCTION
+AC_DEFUN(AC_ENABLE_PRODUCTION, [dnl
+define([AC_ENABLE_PRODUCTION_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(production,
+changequote(<<, >>)dnl
+<<  --enable-production[=PKGS]  build without debug information [default=>>AC_ENABLE_PRODUCTION_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_production=yes ;;
+no) enable_production=no ;;
+*)
+  enable_production=no
+  # Look at the argument we got.  We use all the common list separators.
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+  for pkg in $enableval; do
+    if test "X$pkg" = "X$p"; then
+      enable_production=yes
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac],
+enable_production=AC_ENABLE_PRODUCTION_DEFAULT)dnl
+if test "X$enable_production" = "Xyes"; then
+  FFLAGS="$FFLAGS -O3 "
+  CFLAGS="$CFLAGS -O3 "
+  CXXFLAGS="$CXXFLAGS -O3 "
+else
+  FFLAGS="$FFLAGS"
+  CFLAGS="$CFLAGS"
+  CXXFLAGS="$CXXFLAGS"
+fi
+])
+
+# AC_DISABLE_PRODUCTION - set the default flag to --disable-production
+AC_DEFUN(AC_DISABLE_PRODUCTION, [AC_ENABLE_PRODUCTION(no)])
+
+# AC_ENABLE_DEBUG
+AC_DEFUN(AC_ENABLE_DEBUG, [dnl
+define([AC_ENABLE_DEBUG_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(debug,
+changequote(<<, >>)dnl
+<<  --enable-debug[=PKGS]  build without debug information [default=>>AC_ENABLE_DEBUG_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_debug=yes ;;
+no) enable_debug=no ;;
+*)
+  enable_debug=no
+  # Look at the argument we got.  We use all the common list separators.
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+  for pkg in $enableval; do
+    if test "X$pkg" = "X$p"; then
+      enable_debug=yes
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac],
+enable_debug=AC_ENABLE_DEBUG_DEFAULT)dnl
+
+if test "X$enable_debug" = "Xyes"; then
+  FFLAGS="$FFLAGS -g "
+  CFLAGS="$CFLAGS -g "
+  CXXFLAGS="$CXXFLAGS -g -D_DEBUG_ "
+else
+  FFLAGS="$FFLAGS"
+  CFLAGS="$CFLAGS"
+  CXXFLAGS="$CXXFLAGS"
+fi
+])
+
+# AC_DISABLE_DEBUG - set the default flag to --disable-debug
+AC_DEFUN(AC_DISABLE_DEBUG, [AC_ENABLE_DEBUG(no)])
+
diff --git a/build_cmake b/build_cmake
deleted file mode 100755 (executable)
index 78a124c..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009-2013  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
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-CURRENT_DIR=`pwd`
-CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"`
-cd ${CONF_DIR}
-python $KERNEL_ROOT_DIR/salome_adm/cmake_files/deprecated/am2cmake.py --jobmanager
-status=$?
-cd ${CURRENT_DIR}
-exit $status
diff --git a/build_cmake.bat b/build_cmake.bat
deleted file mode 100644 (file)
index 39a189f..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-@REM Copyright (C) 2009-2013  CEA/DEN, EDF R&D
-@REM
-@REM This library is free software; you can redistribute it and/or
-@REM modify it under the terms of the GNU Lesser General Public
-@REM License as published by the Free Software Foundation; either
-@REM version 2.1 of the License.
-@REM
-@REM This library is distributed in the hope that it will be useful,
-@REM but WITHOUT ANY WARRANTY; without even the implied warranty of
-@REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-@REM Lesser General Public License for more details.
-@REM
-@REM You should have received a copy of the GNU Lesser General Public
-@REM License along with this library; if not, write to the Free Software
-@REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-@REM
-@REM See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-@REM
-
-%PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\deprecated\am2cmake.py --jobmanager\r
diff --git a/build_configure b/build_configure
deleted file mode 100755 (executable)
index a81e739..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009-2013  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
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-ORIG_DIR=`pwd`
-run() {
-    local logfile=$ORIG_DIR/build_configure.log
-    printf "%-50s" "$1 ... "
-    eval $1 > $logfile 2>&1
-    if test $? != 0 ; then
-        echo "[FAILED]"
-        echo "see file build_configure.log ..."
-        exit 1
-    fi
-    echo "[  OK  ]"
-}
-
-run "aclocal -I m4"
-run "libtoolize --force --copy --automake"
-run "autoheader -I m4"
-run "autoconf"
-run "automake --add-missing --copy"
-
diff --git a/clean_configure b/clean_configure
deleted file mode 100755 (executable)
index a2e5d22..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009-2013  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
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-# ---
-# File   : clean_configure
-# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com)
-# ---
-#
-rm -rf autom4te.cache aclocal.m4 configure build_configure.log
-( cd m4 && rm -rf l*.m4 config.guess config.sub install-sh ltmain.sh missing depcomp )
-rm -rf jobmanager_config.h.in INSTALL
-find . -name "*~" -print -exec rm {} \;
-find . -name "*.pyc" -print -exec rm {} \;
-
-# ... 
-
-find . -name Makefile.in | xargs rm -f
diff --git a/configure.ac b/configure.ac
deleted file mode 100644 (file)
index ac33927..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright (C) 2009-2013  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
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-# --
-# Author : André RIBES (EDF)
-# --
-# -----------------------------------------------------------------------------
-#
-AC_INIT([JOBMANAGER project], [7.2.0], [andre.ribes@edf.fr], [JobManager-Module])
-AC_CONFIG_AUX_DIR(m4)
-AM_INIT_AUTOMAKE([tar-pax])
-AC_CONFIG_HEADER(jobmanager_config.h)
-
-# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
-MODULE_NAME=jobmanager
-AC_SUBST(MODULE_NAME)
-
-SHORT_VERSION=`echo $VERSION | awk -F. '{printf("%d.%d",$1,$2)}'`
-AC_SUBST(SHORT_VERSION)
-XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'`
-AC_SUBST(XVERSION)
-
-RELEASE=$VERSION
-AC_SUBST(RELEASE)
-
-# This function return on stdout the absolute path of the filename in
-# argument. Exemple:
-# $ filename="../KERNEL_SRC/configure
-# $ absfilename=`absolute_path $filename`
-function absolute_path {
-    filename=$1
-    here=`pwd`
-    apath=`dirname $filename`
-    cd $apath
-    apath=`pwd`
-    cd $here
-    echo $apath
-}
-
-# Build directory, where the configure script is executed.
-ROOT_BUILDDIR=`pwd`
-# Source directory, where the configure script is located.
-ROOT_SRCDIR=`absolute_path $0`
-
-AC_SUBST(ROOT_SRCDIR)
-AC_SUBST(ROOT_BUILDDIR)
-
-echo
-echo Source root directory : $ROOT_SRCDIR
-echo Build  root directory : $ROOT_BUILDDIR
-
-# -----------------------------------------------------------------------------
-
-AC_ENABLE_DEBUG(yes)
-AC_DISABLE_PRODUCTION
-
-#Linker options
-AC_CANONICAL_BUILD
-AC_LINKER_OPTIONS
-
-#Mandatory products
-AC_PROG_CXX
-AM_PROG_LIBTOOL
-AC_CHECK_LIB(dl,dlopen)
-I2_CHECK_QT4
-AC_CHECK_OMNIORB
-CHECK_BOOST
-
-# Optional products
-CHECK_SPHINX
-
-AC_CHECK_KERNEL
-CHECK_GUI(SALOME_Session_Server,SALOME_Session_Server)
-
-AM_CONDITIONAL([SALOME_KERNEL], [test "x$KERNEL_ROOT_DIR" != "x"])
-AM_CONDITIONAL([HAS_GUI], [test "x$GUI_ROOT_DIR" != "x"])
-
-echo
-echo
-echo
-echo "------------------------------------------------------------------------"
-echo "$PACKAGE $VERSION"
-echo "------------------------------------------------------------------------"
-echo
-echo "Configuration Options Summary:"
-echo
-echo "Mandatory products:"
-echo "  Qt4 (graphic interface)  : $qt_ok"
-echo "  OmniOrb (CORBA) ........ : $omniORB_ok"
-echo "  Boost           ........ : $boost_ok"
-echo "  SALOME KERNEL .......... : $Kernel_ok"
-echo "  SALOME GUI ............. : $SalomeGUI_ok"
-echo
-echo "Optional products:"
-echo "  Sphinx (user doc) ...... : $sphinx_ok"
-echo
-echo "------------------------------------------------------------------------"
-echo
-
-if test "x$omniORB_ok" = "xno"; then
-  AC_MSG_ERROR([OmniOrb is required],1)
-fi
-if test "x$qt_ok" = "xno"; then
-  AC_MSG_ERROR([Qt4 is required],1)
-fi
-if test "x$Kernel_ok" = "xno"; then
-  AC_MSG_ERROR([SALOME KERNEL is required],1)
-fi
-if test "x$SalomeGui_ok" = "xno"; then
-  AC_MSG_ERROR([SALOME GUI is required],1)
-fi
-
-AC_OUTPUT([ \
-  Makefile \
-  idl/Makefile \
-  src/Makefile \
-  src/bases/Makefile \
-  src/engine/Makefile \
-  src/genericgui/Makefile \
-  src/wrappers/Makefile \
-  src/standalone/Makefile \
-  src/standalone/start_jobmanager.sh \
-  src/salomegui/Makefile \
-  src/salomegui/JOBMANAGER_version.h \
-  src/salomegui/resources/SalomeApp.xml \
-  doc/Makefile \
-  doc/conf.py \
-])
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..b7f8982
--- /dev/null
@@ -0,0 +1,106 @@
+# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+# This file mainly prepares the environment in which sphinx should run:
+#  this sets the PYTHONPATH and LD_LIBRARY_PATH to include OMNIORB, DOCUTILS, SETUPTOOLS, etc ...
+
+# Prepare Sphinx options
+SET(SPHINXOPTS
+)
+SET(SOURCEDIR
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+SET(SPHINXBUILD
+  sphinx-build
+)
+SET(PAPEROPT_a4
+  -D
+  latex_paper_size=a4
+)
+SET(ALLSPHINXOPTS
+  -d
+  doctrees
+  ${PAPEROPT_a4}
+  ${SPHINXOPTS}
+  ${SOURCEDIR}
+)
+
+SALOME_CONFIGURE_FILE(conf.py.in conf.py)
+
+# Write the shell file preparing the env for the Sphinx run:
+#    This uses the paths to SPHINX, DOCUTILS and SETUPTOOLS:
+#    Their root dir were found when looking for Sphinx (FindSalomeSphinx.cmake):
+
+SET(_pydir python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+IF(WIN32)
+  STRING(REPLACE "/" "\\" SCR "@SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\lib\\${_pydir}\\site-packages\\salome\;%PYTHONPATH%
+  @SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\bin\\salome\;%PYTHONPATH%
+  @SET PATH=${CMAKE_INSTALL_PREFIX}\\lib\\salome\;%PATH%
+  @SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\${SALOME_INSTALL_PYTHON}\;%PYTHONPATH%
+  @SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\${SALOME_INSTALL_PYTHON_SHARED}\;%PYTHONPATH%
+  @SET PYTHONPATH=${HDF5_ROOT_DIR}\\lib\;%PYTHONPATH%
+  @SET PYTHONPATH=${MPI_ROOT_DIR}\\lib\;%PYTHONPATH%
+
+  @SET PYTHONPATH=${KERNEL_ROOT_DIR}\\bin\\salome\;%PYTHONPATH%
+  @SET PATH=${KERNEL_ROOT_DIR}\\lib\\salome\;%PATH%
+  @SET PYTHONPATH=${KERNEL_ROOT_DIR}\\${SALOME_INSTALL_PYTHON}\;%PYTHONPATH%
+  @SET PYTHONPATH=${KERNEL_ROOT_DIR}\\${SALOME_INSTALL_PYTHON_SHARED}\;%PYTHONPATH%
+
+  @SET PYTHONPATH=${OMNIORB_ROOT_DIR}\\lib\\x86_win32\;%PYTHONPATH%
+  @SET PYTHONPATH=${OMNIORB_ROOT_DIR}\\lib\\python\;%PYTHONPATH%
+  @SET PATH=${OMNIORB_ROOT_DIR}\\lib\\x86_win32\;%PATH%
+  ")
+  SET(EXT "bat")
+  SET(CALL_STR "call")
+ELSE(WIN32)
+  SET(SCR  " export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/lib/${_pydir}/site-packages/salome:\${PYTHONPATH}
+  export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/bin/salome:\${PYTHONPATH}
+  export LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib/salome:\${LD_LIBRARY_PATH}
+  export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON}:\${PYTHONPATH}
+  export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON_SHARED}:\${PYTHONPATH}
+  export PYTHONPATH=${HDF5_ROOT_DIR}/lib:\${PYTHONPATH}
+  export PYTHONPATH=${MPI_ROOT_DIR}/lib:\${PYTHONPATH}
+
+  export PYTHONPATH=${KERNEL_ROOT_DIR}/bin/salome:\${PYTHONPATH}
+  export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+  export PYTHONPATH=${KERNEL_ROOT_DIR}/${SALOME_INSTALL_PYTHON}:\${PYTHONPATH}
+  export PYTHONPATH=${KERNEL_ROOT_DIR}/${SALOME_INSTALL_PYTHON_SHARED}:\${PYTHONPATH}
+
+  export PYTHONPATH=${OMNIORB_ROOT_DIR}/lib:\${PYTHONPATH}
+  export PYTHONPATH=${OMNIORB_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH}
+  export PYTHONPATH=${OMNIORB_ROOT_DIR}/lib64/${_pydir}/site-packages:\${PYTHONPATH}
+  export PYTHONPATH=${OMNIORBPY_ROOT_DIR}/lib:\${PYTHONPATH}
+  export PYTHONPATH=${OMNIORBPY_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH}
+  export PYTHONPATH=${OMNIORBPY_ROOT_DIR}/lib64/${_pydir}/site-packages:\${PYTHONPATH}
+  export LD_LIBRARY_PATH=${OMNIORB_ROOT_DIR}/lib:\${LD_LIBRARY_PATH}
+  export PYTHONPATH=${SETUPTOOLS_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH}
+  export PYTHONPATH=${DOCUTILS_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH}
+  export PYTHONPATH=${SPHINX_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH}
+"
+  )
+  SET(EXT "sh")
+  SET(CALL_STR ".")
+ENDIF(WIN32)
+
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} "${SCR}")
+
+ADD_CUSTOM_TARGET(html_docs ${CALL_STR} ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} && ${SPHINXBUILD} -c ${PROJECT_BINARY_DIR}/doc -b html ${ALLSPHINXOPTS} html)
+
+INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target html_docs)")
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${SALOME_INSTALL_DOC}/gui/JOBMANAGER)
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644 (file)
index 6a19c4b..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright (C) 2009-2013  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
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-include $(top_srcdir)/src/bases/make_begin.am
-
-.PHONY : latex
-
-if SPHINX_IS_OK
-
-jobmanagerdoc_DATA=html/index.html
-html/index.html:$(RSTFILES)
-       make htm
-endif
-
-#EXTRA_DIST= html htmldev _static
-EXTRA_DIST= html html/index.html _static images
-
-jobmanagerdocdir=$(docdir)/gui/JOBMANAGER
-
-SPHINXOPTS      =
-SOURCEDIR       = $(srcdir)
-SPHINXBUILD     = sphinx-build
-PAPEROPT_a4     = -D latex_paper_size=a4
-ALLSPHINXOPTS   = -d doctrees $(PAPEROPT_a4) $(SPHINXOPTS) $(SOURCEDIR)
-
-htm:
-       mkdir -p html doctrees
-       $(SPHINXBUILD) -c $(top_builddir)/doc -b html $(ALLSPHINXOPTS) html
-       @echo
-       @echo "Build finished. The HTML pages are in html."
-
-latex:
-       mkdir -p latex doctrees
-       $(SPHINXBUILD) -c $(top_builddir)/doc -b latex $(ALLSPHINXOPTS) latex
-       @echo
-       @echo "Build finished; the LaTeX files are in latex."
-       @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
-             "run these through (pdf)latex."
-
-html:
-                mkdir -p $@
-
-#htmldev:
-#               mkdir -p $@
-
-RSTFILES=          \
-index.rst          \
-intro.rst          \
-resource.rst       \
-job.rst            \
-jobmanager_gui.rst \
-advanced.rst
-
-
-EXTRA_DIST+= $(RSTFILES)
-
-install-data-local:
-       $(INSTALL) -d $(DESTDIR)$(jobmanagerdocdir)
-       if test -d "html"; then b=; else b="$(srcdir)/"; fi; \
-       cp -rf $$b"html"/* $(DESTDIR)$(jobmanagerdocdir) ; \
-       if test -f $$b"latex"/jobmanager.pdf; then cp -f $$b"latex"/jobmanager.pdf $(DESTDIR)$(jobmanagerdocdir) ; fi;
-
-uninstall-local:
-       chmod -R +w $(DESTDIR)$(jobmanagerdocdir)
-       rm -rf $(DESTDIR)$(jobmanagerdocdir)/*
-
-clean-local:
-       -rm -rf html latex doctrees
-       if test -d "html"; then rm -rf html ; fi
index 544f7c190ed56c11732daef0c8e00f07f2c3a80a..8e2a17a9b6214619dd854823394aa19795c9af67 100644 (file)
@@ -111,7 +111,7 @@ html_theme = 'default'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ['@CMAKE_CURRENT_SOURCE_DIR@/_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..8e470a2
--- /dev/null
@@ -0,0 +1,41 @@
+# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+INCLUDE(UseOmniORB)  # Provided by KERNEL
+
+INCLUDE_DIRECTORIES(
+  ${OMNIORB_INCLUDE_DIR}
+  ${KERNEL_INCLUDE_DIRS}
+  ${PROJECT_BINARY_DIR}/idl
+)
+
+SET(SalomeIDLJOBMANAGER_IDLSOURCES
+  JOBMANAGER_IDL.idl
+)
+
+SET(_idl_include_dirs
+  ${KERNEL_ROOT_DIR}/idl/salome
+)
+
+SET(_idl_link_flags
+  ${KERNEL_SalomeIDLKernel}
+)
+
+OMNIORB_ADD_MODULE(JOBMANAGER_IDL "${SalomeIDLJOBMANAGER_IDLSOURCES}" "${_idl_include_dirs}" "${_idl_link_flags}")
+INSTALL(TARGETS JOBMANAGER_IDL EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
diff --git a/idl/Makefile.am b/idl/Makefile.am
deleted file mode 100644 (file)
index 3b8968c..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (C) 2009-2013  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
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-salomeidldir       = $(prefix)/idl
-salomeincludedir   = $(includedir)/salome
-libdir             = $(prefix)/lib/salome
-
-BUILT_SOURCES = JOBMANAGER_IDLSK.cc
-IDL_FILES     = JOBMANAGER_IDL.idl
-
-lib_LTLIBRARIES = libJOBMANAGER_IDL.la
-salomeidl_DATA = $(IDL_FILES)
-
-nodist_libJOBMANAGER_IDL_la_SOURCES = JOBMANAGER_IDLSK.cc
-nodist_salomeinclude_HEADERS    = JOBMANAGER_IDL.hh
-
-libJOBMANAGER_IDL_la_CXXFLAGS     = -I. @KERNEL_CXXFLAGS@ @OMNIORB_CXXFLAGS@ @OMNIORB_INCLUDES@
-libJOBMANAGER_IDL_la_LIBADD       = $(KERNEL_LIBS)
-
-OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ -I$(KERNEL_ROOT_DIR)/idl/salome
-
-%SK.cc %.hh : %.idl
-       $(OMNIORB_IDL) -bcxx $(OMNIORB_IDLCXXFLAGS) $<
-
-# E.A. : IDLPYFLAGS is just to compile with cmake (parsed in am2cmake).
-
-IDLPYFLAGS = @IDLPYFLAGS@ -I$(KERNEL_ROOT_DIR)/idl/salome
-
-CLEANFILES = *.hh *SK.cc *.py *.hxx *.cxx
-
-EXTRA_DIST = $(IDL_FILES)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..881be94
--- /dev/null
@@ -0,0 +1,39 @@
+# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+##
+# Common packages
+##
+SET(SUBDIRS_COMMON
+  bases 
+  engine 
+  genericgui 
+  wrappers 
+  standalone 
+  salomegui
+)
+
+SET(SUBDIRS
+  ${SUBDIRS_COMMON}
+)
+
+FOREACH(dir ${SUBDIRS})
+ ADD_SUBDIRECTORY(${dir})
+ENDFOREACH(dir ${SUBDIRS})
+            
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644 (file)
index ba19419..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2009-2013  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
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-SUBDIRS = bases engine genericgui wrappers standalone salomegui
diff --git a/src/bases/CMakeLists.txt b/src/bases/CMakeLists.txt
new file mode 100644 (file)
index 0000000..b64f5d8
--- /dev/null
@@ -0,0 +1,42 @@
+# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+# --- headers ---
+
+# header files / no moc processed
+SET(BL_Bases_HEADERS
+  BL_Traces.hxx 
+  BL_Exception.hxx
+)
+
+# --- sources ---
+
+# sources / static
+SET(BL_Bases_SOURCES
+  BL_Exception.cxx 
+  BL_Exception.hxx
+)
+
+# --- rules ---
+
+ADD_LIBRARY(BL_Bases ${BL_Bases_SOURCES})
+TARGET_LINK_LIBRARIES(BL_Bases ${_link_LIBRARIES} )
+INSTALL(TARGETS BL_Bases EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+
+INSTALL(FILES ${BL_Bases_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
diff --git a/src/bases/Makefile.am b/src/bases/Makefile.am
deleted file mode 100644 (file)
index 9a71bb1..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) 2009-2013  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
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-include $(top_srcdir)/src/bases/make_begin.am
-
-lib_LTLIBRARIES = libBL_Bases.la
-
-libBL_Bases_la_SOURCES = BL_Exception.cxx BL_Exception.hxx
-
-salomeinclude_HEADERS = BL_Traces.hxx BL_Exception.hxx
diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt
new file mode 100644 (file)
index 0000000..3e849c2
--- /dev/null
@@ -0,0 +1,62 @@
+# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+# --- options ---
+# additional include directories
+INCLUDE_DIRECTORIES(
+  ${OMNIORB_INCLUDE_DIR}
+  ${KERNEL_INCLUDE_DIRS}
+  ${PROJECT_BINARY_DIR}/idl
+  ${PROJECT_SOURCE_DIR}/src/bases
+)
+
+# additional preprocessor / compiler flags
+ADD_DEFINITIONS(
+  ${OMNIORB_DEFINITIONS}
+)
+
+# libraries to link to
+SET(_link_LIBRARIES
+  ${CORBA_LIBS}
+  ${KERNEL_SalomeIDLKernel}
+  ${KERNEL_SalomeNS}
+  ${KERNEL_SalomeLifeCycleCORBA}
+  BL_Bases
+  JOBMANAGER_IDL
+)
+
+# --- sources ---
+
+# sources / static
+SET(BL_Engine_SOURCES
+  BL_Engine.hxx 
+  BL_JobsManager.hxx 
+  BL_JobsManager.cxx
+  BL_Job.hxx 
+  BL_Job.cxx
+  BL_SALOMEServices.hxx 
+  BL_SALOMEServices.cxx
+  BL_Observer.hxx
+)
+
+# --- rules ---
+
+ADD_LIBRARY(BL_Engine ${BL_Engine_SOURCES})
+TARGET_LINK_LIBRARIES(BL_Engine ${_link_LIBRARIES} )
+INSTALL(TARGETS BL_Engine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
deleted file mode 100644 (file)
index 4ff5e3c..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (C) 2009-2013  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
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-libdir = $(prefix)/lib/salome
-
-lib_LTLIBRARIES = libBL_Engine.la
-
-libBL_Engine_la_SOURCES = BL_Engine.hxx BL_JobsManager.hxx BL_JobsManager.cxx \
-                         BL_Job.hxx BL_Job.cxx \
-                         BL_SALOMEServices.hxx BL_SALOMEServices.cxx \
-                         BL_Observer.hxx
-
-libBL_Engine_la_CXXFLAGS = -I$(top_srcdir)/src/bases \
-                          $(OMNIORB_INCLUDES) $(OMNIORB_CXXFLAGS) \
-                          -I$(KERNEL_ROOT_DIR)/include/salome \
-                          -I../../idl
-
-libBL_Engine_la_LIBADD = $(top_builddir)/src/bases/libBL_Bases.la  $(top_builddir)/idl/libJOBMANAGER_IDL.la $(OMNIORB_LIBS) \
-                        $(KERNEL_LDFLAGS) -lSalomeIDLKernel -lSalomeNS -lSalomeLifeCycleCORBA \
-                         @OMNIORB_LIBS@
-
index a5db879a25159fe2865842e08055909aea9dcc99..a811a1d890bb3843c940e851582a73ceecdd3d2b 100644 (file)
@@ -27,8 +27,8 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include <ui_ResourceRequirementsWizardPage.hxx>
-#include <ui_FilesWizardPage.hxx>
+#include <ui_ResourceRequirementsWizardPage.h>
+#include <ui_FilesWizardPage.h>
 
 #ifdef WNT
 #undef ERROR
diff --git a/src/genericgui/CMakeLists.txt b/src/genericgui/CMakeLists.txt
new file mode 100644 (file)
index 0000000..8ace8ce
--- /dev/null
@@ -0,0 +1,103 @@
+# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+INCLUDE(UseQt4Ext)
+
+# --- options ---
+# additional include directories
+INCLUDE_DIRECTORIES(
+  ${QT_INCLUDES}
+  ${OMNIORB_INCLUDE_DIR}
+  ${KERNEL_INCLUDE_DIRS}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${PROJECT_BINARY_DIR}/idl
+  ${PROJECT_SOURCE_DIR}/src/bases
+  ${PROJECT_SOURCE_DIR}/src/engine
+  ${PROJECT_SOURCE_DIR}/src/wrappers
+)
+
+# additional preprocessor / compiler flags
+ADD_DEFINITIONS(
+  ${QT_DEFINITIONS}
+  ${OMNIORB_DEFINITIONS}
+)
+
+# libraries to link to
+SET(_link_LIBRARIES
+  ${QT_LIBRARIES}
+  BL_Bases
+  BL_Engine
+)
+
+# --- headers ---
+
+# header files / to be processed by moc
+SET(BL_GenericGui_HEADERS
+  BL_GenericGui.hxx
+  BL_JobsTable.hxx
+  BL_JobTab.hxx
+  BL_Buttons.hxx 
+  BL_JobsManager_QT.hxx
+  BL_QModelManager.hxx 
+  BL_CreateJobWizard.hxx
+  BL_Summary.hxx 
+  JM_ResourceCatalog.hxx
+  JM_SalomeResource.hxx 
+  JM_EditSalomeResource.hxx
+)
+
+# --- sources ---
+
+# sources / moc wrappings
+QT4_WRAP_CPP(_moc_SOURCES ${BL_GenericGui_HEADERS})
+
+# sources / static
+SET(_other_SOURCES 
+  BL_GenericGui.cxx 
+  BL_JobsTable.cxx 
+  BL_JobTab.cxx
+  BL_Buttons.cxx
+  BL_JobsManager_QT.cxx 
+  BL_QModelManager.cxx 
+  BL_CreateJobWizard.cxx 
+  BL_Summary.cxx 
+  JM_ResourceCatalog.cxx 
+  JM_SalomeResource.cxx 
+  JM_EditSalomeResource.cxx
+)
+
+# --- resources ---
+
+# resource files / to be processed by uic
+SET(_uic_files
+  ResourceRequirementsWizardPage.ui
+  FilesWizardPage.ui
+)
+
+# header files / uic wrappings
+QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+
+# sources / to compile
+SET(BL_GenericGui_SOURCES ${_other_SOURCES} ${_moc_SOURCES} ${_uic_HEADERS})
+
+# --- rules ---
+
+ADD_LIBRARY(BL_GenericGui ${BL_GenericGui_SOURCES})
+TARGET_LINK_LIBRARIES(BL_GenericGui ${_link_LIBRARIES} )
+INSTALL(TARGETS BL_GenericGui EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
diff --git a/src/genericgui/Makefile.am b/src/genericgui/Makefile.am
deleted file mode 100644 (file)
index 666f79b..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright (C) 2009-2013  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
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-libdir = $(prefix)/lib/salome
-
-lib_LTLIBRARIES = libBL_GenericGui.la
-
-libBL_GenericGui_la_SOURCES = BL_GenericGuiDefines.hxx \
-                             BL_GenericGui.hxx BL_GenericGui.cxx \
-                             BL_JobsTable.hxx BL_JobsTable.cxx \
-                             BL_JobTab.hxx BL_JobTab.cxx \
-                             BL_Buttons.hxx BL_Buttons.cxx \
-                             BL_JobsManager_QT.hxx BL_JobsManager_QT.cxx \
-                             BL_QModelManager.hxx BL_QModelManager.cxx \
-                             BL_CreateJobWizard.hxx BL_CreateJobWizard.cxx \
-                             BL_Summary.hxx BL_Summary.cxx \
-                             JM_ResourceCatalog.hxx JM_ResourceCatalog.cxx \
-                             JM_SalomeResource.hxx JM_SalomeResource.cxx \
-                             JM_EditSalomeResource.hxx JM_EditSalomeResource.cxx
-
-MOC_FILES =                          BL_GenericGui_moc.cxx BL_JobsTable_moc.cxx \
-                                    BL_JobTab_moc.cxx  \
-                                    BL_Buttons_moc.cxx BL_JobsManager_QT_moc.cxx \
-                                    BL_QModelManager_moc.cxx BL_CreateJobWizard_moc.cxx \
-                                    BL_Summary_moc.cxx JM_ResourceCatalog_moc.cxx \
-                                    JM_SalomeResource_moc.cxx JM_EditSalomeResource_moc.cxx
-
-UIC_FILES = ui_ResourceRequirementsWizardPage.hxx \
-            ui_FilesWizardPage.hxx
-
-nodist_libBL_GenericGui_la_SOURCES = $(MOC_FILES) $(UIC_FILES)
-
-BUILT_SOURCES = $(MOC_FILES) $(UIC_FILES)
-
-# extra distributed files
-EXTRA_DIST = $(UIC_FILES:ui_%.hxx=%.ui)
-
-libBL_GenericGui_la_CXXFLAGS = $(qt4_cppflags) \
-                              -I$(top_srcdir)/src/bases \
-                              -I$(top_srcdir)/src/engine \
-                              -I$(KERNEL_ROOT_DIR)/include/salome \
-                              $(OMNIORB_INCLUDES) $(OMNIORB_CXXFLAGS) \
-                              -I../../idl \
-                              -I$(top_srcdir)/src/wrappers
-
-libBL_GenericGui_la_LDFLAGS = $(qt4_ldflags) 
-
-libBL_GenericGui_la_LIBADD = -lQtGui -lQtCore \
-                            $(top_builddir)/src/bases/libBL_Bases.la \
-                            $(top_builddir)/src/engine/libBL_Engine.la
-
-SUFFIXES = .hxx _moc.cxx .qrc _qrc.cxx
-
-.hxx_moc.cxx :
-       $(QT_MOC) -p . -o $@ $<
-
-.qrc_qrc.cxx :
-       $(QT_RCC) -name $(*F)  $< -o $@
-
-# qt forms files generation (uic)
-ui_%.hxx: %.ui
-       $(QT_UIC) -o $@ $<
-
-clean-local-qt :
-       rm -f *_moc.cxx *_qrc.cxx ui_*.hxx
-
-clean-local: clean-local-qt
-
diff --git a/src/salomegui/CMakeLists.txt b/src/salomegui/CMakeLists.txt
new file mode 100644 (file)
index 0000000..ade9267
--- /dev/null
@@ -0,0 +1,88 @@
+# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+# --- options ---
+# additional include directories
+INCLUDE_DIRECTORIES(
+  ${Boost_INCLUDE_DIRS}
+  ${OMNIORB_INCLUDE_DIR}
+  ${KERNEL_INCLUDE_DIRS}
+  ${GUI_INCLUDE_DIRS}
+  ${PROJECT_BINARY_DIR}
+  ${PROJECT_BINARY_DIR}/idl
+  ${PROJECT_SOURCE_DIR}/src/genericgui
+  ${PROJECT_SOURCE_DIR}/src/wrappers
+  ${PROJECT_SOURCE_DIR}/src/engine
+  ${PROJECT_SOURCE_DIR}/src/bases
+)
+
+# additional preprocessor / compiler flags
+ADD_DEFINITIONS(
+  ${OMNIORB_DEFINITIONS}
+  ${BOOST_DEFINITIONS}
+)
+
+# libraries to link to
+SET(_link_LIBRARIES
+  ${CORBA_LIBS}
+  BL_Bases
+  BL_Engine
+  BL_GenericGui
+  BL_Wrappers_SALOME
+  JOBMANAGER_IDL
+)
+
+# --- headers ---
+
+# header files / to be processed by moc
+SET(JOBMANAGER_HEADERS
+  BL_SalomeGui.hxx
+)
+
+# --- sources ---
+
+# sources / moc wrappings
+QT4_WRAP_CPP(_moc_SOURCES ${JOBMANAGER_HEADERS})
+
+# sources / static
+SET(_other_SOURCES
+  BL_SalomeGui.cxx
+)
+
+# --- resources ---
+
+SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/resources/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/resources/SalomeApp.xml INSTALL ${SALOME_JOBMANAGER_INSTALL_RES_DATA})
+
+# resource files / static
+SET(_other_RESOURCES
+  resources/jobmanager.png
+)
+
+# sources / to compile
+SET(JOBMANAGER_SOURCES ${_other_SOURCES} ${_moc_SOURCES})
+
+# --- rules ---
+
+ADD_LIBRARY(JOBMANAGER ${JOBMANAGER_SOURCES})
+TARGET_LINK_LIBRARIES(JOBMANAGER ${_link_LIBRARIES} )
+INSTALL(TARGETS JOBMANAGER EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+
+INSTALL(FILES ${JOBMANAGER_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
+
+INSTALL(FILES ${_other_RESOURCES} DESTINATION ${SALOME_JOBMANAGER_INSTALL_RES_DATA})
\ No newline at end of file
diff --git a/src/salomegui/Makefile.am b/src/salomegui/Makefile.am
deleted file mode 100644 (file)
index f6538df..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright (C) 2009-2013  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
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-include $(top_srcdir)/src/bases/make_begin.am
-
-MOC_FILES = BL_SalomeGui_moc.cxx
-
-lib_LTLIBRARIES = libJOBMANAGER.la
-
-dist_libJOBMANAGER_la_SOURCES = BL_SalomeGui.hxx BL_SalomeGui.cxx
-
-nodist_libJOBMANAGER_la_SOURCES = $(MOC_FILES)
-
-libJOBMANAGER_la_CXXFLAGS = $(qt4_cppflags) \
-                               $(BOOST_CPPFLAGS) \
-                               $(OMNIORB_INCLUDES) $(OMNIORB_CXXFLAGS) \
-                               -I$(top_builddir)/idl \
-                               -I. \
-                               -I$(KERNEL_ROOT_DIR)/include/salome \
-                               -I$(GUI_ROOT_DIR)/include/salome \
-                               -I$(top_srcdir)/src/genericgui \
-                               -I$(top_srcdir)/src/wrappers \
-                               -I$(top_srcdir)/src/engine \
-                               -I$(top_srcdir)/src/bases
-
-libJOBMANAGER_la_LDFLAGS  = -L$(GUI_ROOT_DIR)/lib/salome \
-                               -L$(KERNEL_ROOT_DIR)/lib/salome \
-                               $(qt4_ldflags)
-
-libJOBMANAGER_la_LIBADD  = $(qt4_libs) \
-                          $(top_builddir)/idl/libJOBMANAGER_IDL.la \
-                          @OMNIORB_LIBS@ \
-                              $(top_builddir)/src/bases/libBL_Bases.la \
-                              $(top_builddir)/src/engine/libBL_Engine.la \
-                              $(top_builddir)/src/genericgui/libBL_GenericGui.la \
-                              $(top_builddir)/src/wrappers/libBL_Wrappers_SALOME.la \
-                              -lSalomeApp
-
-salomeinclude_HEADERS = BL_SalomeGui.hxx
-salomeinclude_DATA = JOBMANAGER_version.h
-
-# resources files
-ICONS = resources/jobmanager.png
-
-nodist_salomeres_SCRIPTS = resources/SalomeApp.xml
-
-dist_salomeres_DATA = ${ICONS}
-
-# --------------------------------------------
-# *.h --> *_moc.cxx
-# --------------------------------------------
-
-SUFFIXES = .hxx _moc.cxx .qrc _qrc.cxx
-
-.hxx_moc.cxx :
-       $(QT_MOC) -p . -o $@ $<
-
-.qrc_qrc.cxx :
-       $(QT_RCC) -name $(*F)  $< -o $@
-
-#.ui.h :
-#      $(QT_UIC) -o $@ $<
-
-
-clean-local-qt :
-       rm -f *_moc.cxx *_qrc.cxx
-
-
-clean-local: clean-local-qt
-       rm -f YACS_msg_en.qm YACS_msg_fr.qm
diff --git a/src/standalone/CMakeLists.txt b/src/standalone/CMakeLists.txt
new file mode 100644 (file)
index 0000000..672d9f4
--- /dev/null
@@ -0,0 +1,74 @@
+# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+# --- options ---
+# additional include directories
+INCLUDE_DIRECTORIES(
+  ${QT_INCLUDES}
+  ${KERNEL_INCLUDE_DIRS}
+  ${OMNIORB_INCLUDE_DIR}
+  ${PROJECT_BINARY_DIR}/idl
+  ${PROJECT_SOURCE_DIR}/src/bases
+  ${PROJECT_SOURCE_DIR}/src/engine
+  ${PROJECT_SOURCE_DIR}/src/wrappers
+  ${PROJECT_SOURCE_DIR}/src/genericgui
+)
+
+# additional preprocessor / compiler flags
+ADD_DEFINITIONS(
+  ${OMNIORB_DEFINITIONS}
+)
+
+# libraries to link to
+SET(_link_LIBRARIES
+  ${CORBA_LIBS}
+  ${QT_LIBRARIES}
+  ${KERNEL_SalomeLifeCycleCORBA}
+  ${KERNEL_SalomeIDLKernel}
+  ${KERNEL_SalomeNS}
+  ${KERNEL_OpUtil}
+  ${KERNEL_SALOMELocalTrace}
+  ${KERNEL_SALOMEBasics}
+  ${KERNEL_SalomeContainer}
+  ${KERNEL_SalomeHDFPersist}
+  ${KERNEL_SalomeResourcesManager}
+  ${KERNEL_ResourcesManager}
+  ${KERNEL_SalomeGenericObj}
+  ${KERNEL_SalomeNotification}
+  ${KERNEL_Registry}
+  BL_GenericGui
+  BL_Engine
+  BL_Wrappers_Qt
+  JOBMANAGER_IDL
+)
+
+# --- sources ---
+
+# sources / static
+SET(jobmanager_gui_SOURCES
+  main.cxx 
+)
+
+# --- rules ---
+
+ADD_EXECUTABLE(jobmanager_gui ${jobmanager_gui_SOURCES})
+TARGET_LINK_LIBRARIES(jobmanager_gui ${_link_LIBRARIES})
+INSTALL(TARGETS jobmanager_gui EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
+
+SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/start_jobmanager.sh.in ${CMAKE_CURRENT_BINARY_DIR}/start_jobmanager.sh INSTALL ${SALOME_INSTALL_BINS})
diff --git a/src/standalone/Makefile.am b/src/standalone/Makefile.am
deleted file mode 100644 (file)
index d360d9c..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (C) 2009-2013  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
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-bin_PROGRAMS = jobmanager_gui
-
-bin_SCRIPTS = start_jobmanager.sh
-
-jobmanager_gui_SOURCES = main.cxx 
-
-jobmanager_gui_CXXFLAGS = $(qt4_cppflags) \
-                             -I$(top_srcdir)/src/bases \
-                             -I$(top_srcdir)/src/engine \
-                             -I$(KERNEL_ROOT_DIR)/include/salome \
-                               $(OMNIORB_INCLUDES) $(OMNIORB_CXXFLAGS) \
-                              -I../../idl \
-                             -I$(top_srcdir)/src/wrappers \
-                             -I$(top_srcdir)/src/genericgui
-
-jobmanager_gui_LDFLAGS = $(qt4_ldflags)
-
-jobmanager_gui_LDADD = -lQtGui -lQtCore \
-                          $(top_builddir)/src/genericgui/libBL_GenericGui.la \
-                          $(top_builddir)/src/engine/libBL_Engine.la \
-                          $(top_builddir)/src/wrappers/libBL_Wrappers_Qt.la \
-                          @OMNIORB_LIBS@ \
-                          $(top_builddir)/idl/libJOBMANAGER_IDL.la \
-                          -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeLifeCycleCORBA -lSalomeIDLKernel -lSalomeNS -lOpUtil \
-                          -lSALOMELocalTrace -lSALOMEBasics -lSalomeContainer -lSalomeHDFPersist -lSalomeResourcesManager \
-                          -lResourcesManager -lSalomeIDLKernel -lSalomeGenericObj -lSalomeNotification -lRegistry
-                          
-
-EXTRA_DIST = start_jobmanager.sh.in
diff --git a/src/wrappers/CMakeLists.txt b/src/wrappers/CMakeLists.txt
new file mode 100644 (file)
index 0000000..bc2a384
--- /dev/null
@@ -0,0 +1,79 @@
+# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+# --- options ---
+# additional include directories
+INCLUDE_DIRECTORIES(
+  ${QT_INCLUDES}
+  ${OMNIORB_INCLUDE_DIR}
+  ${KERNEL_INCLUDE_DIRS}
+  ${GUI_INCLUDE_DIRS}
+  ${Boost_INCLUDE_DIRS}
+  ${PROJECT_SOURCE_DIR}/src/bases
+)
+
+# additional preprocessor / compiler flags
+ADD_DEFINITIONS(
+  ${QT_DEFINITIONS}
+  ${OMNIORB_DEFINITIONS}
+  ${CAS_DEFINITIONS}
+  ${BOOST_DEFINITIONS}
+)
+
+# libraries to link to
+SET(_link_LIBRARIES_Wrappers_Qt
+  ${QT_LIBRARIES}
+  BL_Bases
+)
+
+SET(_link_LIBRARIES_Wrappers_SALOME
+  ${CORBA_LIBS}
+  ${GUI_LightApp}
+  ${GUI_SalomeApp}
+  ${GUI_SalomeSession}
+  ${GUI_CAM}
+  ${GUI_suit}
+  ${KERNEL_SalomeIDLKernel}
+  ${_link_LIBRARIES_Wrappers_Qt}
+)
+
+# --- sources ---
+
+# sources / static
+SET(BL_Wrappers_Qt_SOURCES
+  BL_MainWindows_Wrap.hxx
+  BL_MainWindows_Qt.cxx
+  BL_MainWindows_Qt.hxx
+)
+
+SET(BL_Wrappers_SALOME_SOURCES
+  BL_MainWindows_Wrap.hxx
+  BL_MainWindows_SALOME.cxx
+  BL_MainWindows_SALOME.hxx
+)
+
+# --- rules ---
+
+ADD_LIBRARY(BL_Wrappers_Qt ${BL_Wrappers_Qt_SOURCES})
+TARGET_LINK_LIBRARIES(BL_Wrappers_Qt ${_link_LIBRARIES_Wrappers_Qt} )
+INSTALL(TARGETS BL_Wrappers_Qt EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+
+ADD_LIBRARY(BL_Wrappers_SALOME ${BL_Wrappers_SALOME_SOURCES})
+TARGET_LINK_LIBRARIES(BL_Wrappers_SALOME ${_link_LIBRARIES_Wrappers_SALOME} )
+INSTALL(TARGETS BL_Wrappers_SALOME EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
diff --git a/src/wrappers/Makefile.am b/src/wrappers/Makefile.am
deleted file mode 100644 (file)
index 41aacc8..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright (C) 2009-2013  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
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-libdir = $(prefix)/lib/salome
-
-lib_LTLIBRARIES = libBL_Wrappers_Qt.la 
-
-if HAS_GUI
-lib_LTLIBRARIES += libBL_Wrappers_SALOME.la
-endif
-
-libBL_Wrappers_Qt_la_SOURCES = BL_MainWindows_Wrap.hxx \
-                              BL_MainWindows_Qt.cxx  BL_MainWindows_Qt.hxx
-
-nodist_libBL_Wrappers_Qt_la_SOURCES =
-
-libBL_Wrappers_Qt_la_CXXFLAGS = $(qt4_cppflags) -I$(top_srcdir)/src/bases
-
-libBL_Wrappers_Qt_la_LDFLAGS = $(qt4_ldflags) 
-
-libBL_Wrappers_Qt_la_LIBADD = -lQtGui -lQtCore $(top_builddir)/src/bases/libBL_Bases.la
-
-###########
-
-libBL_Wrappers_SALOME_la_SOURCES = BL_MainWindows_Wrap.hxx \
-                                  BL_MainWindows_SALOME.cxx  BL_MainWindows_SALOME.hxx
-
-nodist_libBL_Wrappers_SALOME_la_SOURCES =
-
-libBL_Wrappers_SALOME_la_CXXFLAGS = $(qt4_cppflags) -I$(top_srcdir)/src/bases \
-                                   $(OMNIORB_INCLUDES) $(OMNIORB_CXXFLAGS) $(BOOST_CPPFLAGS) \
-                                   -I$(KERNEL_ROOT_DIR)/include/salome \
-                                   -I$(GUI_ROOT_DIR)/include/salome
-
-libBL_Wrappers_SALOME_la_LDFLAGS = $(qt4_ldflags) 
-
-libBL_Wrappers_SALOME_la_LIBADD = -lQtGui -lQtCore $(top_builddir)/src/bases/libBL_Bases.la $(OMNIORB_LIBS) \
-                                 $(KERNEL_LDFLAGS) -lSalomeIDLKernel $(GUI_LDFLAGS) -lLightApp -lSalomeApp -lSalomeSession -lCAM -lsuit
-