Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[EDF29150] : End of save / load of LogManager + non regression test.
[modules/kernel.git]
/
SalomeKERNELConfig.cmake.in
diff --git
a/SalomeKERNELConfig.cmake.in
b/SalomeKERNELConfig.cmake.in
index 13c0d81c986fb3318e04c159565098f2c971c586..e10dc71eac80d8e9be4a56924a92ccb1e676f024 100644
(file)
--- a/
SalomeKERNELConfig.cmake.in
+++ b/
SalomeKERNELConfig.cmake.in
@@
-7,10
+7,10
@@
# SALOME_USE_MPI - ON if KERNEL is built with MPI support
# SALOME_KERNEL_BUILD_DOC - ON if documentation for KERNEL module has been built
# SALOME_KERNEL_BUILD_TESTS - ON if tests for KERNEL module has been built
# SALOME_USE_MPI - ON if KERNEL is built with MPI support
# SALOME_KERNEL_BUILD_DOC - ON if documentation for KERNEL module has been built
# SALOME_KERNEL_BUILD_TESTS - ON if tests for KERNEL module has been built
-# SALOME_
LIGHT_ONLY
- ON if SALOME is built in Light mode (no CORBA)
+# SALOME_
KERNEL_LIGHT_ONLY
- ON if SALOME is built in Light mode (no CORBA)
###############################################################
###############################################################
-# Copyright (C) 2007-202
1 CEA/DEN, EDF R&D
, OPEN CASCADE
+# Copyright (C) 2007-202
3 CEA, EDF
, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-66,6
+66,11
@@
SET(SALOME_KERNEL_BUILD_DOC @SALOME_BUILD_DOC@)
SET(SALOME_KERNEL_BUILD_TESTS @SALOME_BUILD_TESTS@)
SET(SALOME_KERNEL_LIGHT_ONLY @SALOME_LIGHT_ONLY@)
SET(SALOME_USE_LIBBATCH @SALOME_USE_LIBBATCH@)
SET(SALOME_KERNEL_BUILD_TESTS @SALOME_BUILD_TESTS@)
SET(SALOME_KERNEL_LIGHT_ONLY @SALOME_LIGHT_ONLY@)
SET(SALOME_USE_LIBBATCH @SALOME_USE_LIBBATCH@)
+SET(SALOME_USE_64BIT_IDS @SALOME_USE_64BIT_IDS@)
+
+IF(SALOME_KERNEL_LIGHT_ONLY)
+ ADD_DEFINITIONS(-DSALOME_LIGHT)
+ENDIF()
# Prerequisites:
IF(SALOME_KERNEL_BUILD_TESTS)
# Prerequisites:
IF(SALOME_KERNEL_BUILD_TESTS)
@@
-79,7
+84,7
@@
ENDIF()
IF(SALOME_USE_MPI)
SET_AND_CHECK(MPI_ROOT_DIR_EXP "@PACKAGE_MPI_ROOT_DIR@")
ENDIF()
IF(SALOME_USE_MPI)
SET_AND_CHECK(MPI_ROOT_DIR_EXP "@PACKAGE_MPI_ROOT_DIR@")
ENDIF()
-IF(NOT SALOME_LIGHT_ONLY)
+IF(NOT SALOME_
KERNEL_
LIGHT_ONLY)
SET_AND_CHECK(OMNIORB_ROOT_DIR_EXP "@PACKAGE_OMNIORB_ROOT_DIR@")
SET_AND_CHECK(OMNIORBPY_ROOT_DIR_EXP "@PACKAGE_OMNIORBPY_ROOT_DIR@")
ENDIF()
SET_AND_CHECK(OMNIORB_ROOT_DIR_EXP "@PACKAGE_OMNIORB_ROOT_DIR@")
SET_AND_CHECK(OMNIORBPY_ROOT_DIR_EXP "@PACKAGE_OMNIORBPY_ROOT_DIR@")
ENDIF()
@@
-96,6
+101,7
@@
SET_AND_CHECK(SWIG_ROOT_DIR_EXP "@PACKAGE_SWIG_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:
# 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:
+unset(Boost_USE_DEBUG_RUNTIME) # problem detected in 9.9.0 with persalys. After a first find_package (Boost) FIND_PACKAGE 15 lines under failed
SET(_PREREQ_@PROJECT_NAME@ @_PREREQ_LIST@)
SET(_PREREQ_@PROJECT_NAME@_CONFIG_DIR @_PREREQ_DIR_LIST@)
SET(_PREREQ_@PROJECT_NAME@_COMPONENTS "@_PREREQ_COMPO_LIST@")
SET(_PREREQ_@PROJECT_NAME@ @_PREREQ_LIST@)
SET(_PREREQ_@PROJECT_NAME@_CONFIG_DIR @_PREREQ_DIR_LIST@)
SET(_PREREQ_@PROJECT_NAME@_COMPONENTS "@_PREREQ_COMPO_LIST@")
@@
-153,6
+159,7
@@
SET(KERNEL_NamingServiceTest NamingServiceTest)
SET(KERNEL_OpUtil OpUtil)
SET(KERNEL_Registry Registry)
SET(KERNEL_ResourcesManager ResourcesManager)
SET(KERNEL_OpUtil OpUtil)
SET(KERNEL_Registry Registry)
SET(KERNEL_ResourcesManager ResourcesManager)
+SET(KERNEL_SALOMELog SALOMELog)
SET(KERNEL_SALOMEBasics SALOMEBasics)
SET(KERNEL_SalomeCatalog SalomeCatalog)
SET(KERNEL_SalomeCommunication SalomeCommunication)
SET(KERNEL_SALOMEBasics SALOMEBasics)
SET(KERNEL_SalomeCatalog SalomeCatalog)
SET(KERNEL_SalomeCommunication SalomeCommunication)
@@
-186,3
+193,4
@@
SET(KERNEL_TOOLSDS TOOLSDS)
SET(KERNEL_UtilsTest UtilsTest)
SET(KERNEL_with_loggerTraceCollector with_loggerTraceCollector)
SET(KERNEL_SalomeKernelHelpers SalomeKernelHelpers)
SET(KERNEL_UtilsTest UtilsTest)
SET(KERNEL_with_loggerTraceCollector with_loggerTraceCollector)
SET(KERNEL_SalomeKernelHelpers SalomeKernelHelpers)
+SET(KERNEL_SalomeORB SalomeORB)