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
0023366: [CEA 1972] Porting Salome to GCC 6
[modules/kernel.git]
/
src
/
Container
/
CMakeLists.txt
diff --git
a/src/Container/CMakeLists.txt
b/src/Container/CMakeLists.txt
index b6b654456ed587450d10ba4bdfe3fbf6d6996233..530763b1ea0b90ee8e62c865f5d26c951518f261 100755
(executable)
--- a/
src/Container/CMakeLists.txt
+++ b/
src/Container/CMakeLists.txt
@@
-1,9
+1,9
@@
-# Copyright (C) 2012-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-201
6
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
#
# 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.
+# version 2.1 of the License
, or (at your option) any later version
.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-18,12
+18,11
@@
#
INCLUDE_DIRECTORIES(
#
INCLUDE_DIRECTORIES(
- ${PTHREAD_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
${OMNIORB_INCLUDE_DIR}
+ ${PTHREAD_INCLUDE_DIR}
${HDF5_INCLUDE_DIRS}
${HDF5_INCLUDE_DIRS}
- ${LIBXML2_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
- ${
CMAKE
_BINARY_DIR}/salome_adm
+ ${
PROJECT
_BINARY_DIR}/salome_adm
${CMAKE_CURRENT_SOURCE_DIR}/../Basics
${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
${CMAKE_CURRENT_SOURCE_DIR}/../NamingService
${CMAKE_CURRENT_SOURCE_DIR}/../Basics
${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
${CMAKE_CURRENT_SOURCE_DIR}/../NamingService
@@
-34,7
+33,7
@@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/../HDFPersist
${CMAKE_CURRENT_SOURCE_DIR}/../GenericObj
${CMAKE_CURRENT_SOURCE_DIR}/../SALOMETraceCollector/Test
${CMAKE_CURRENT_SOURCE_DIR}/../HDFPersist
${CMAKE_CURRENT_SOURCE_DIR}/../GenericObj
${CMAKE_CURRENT_SOURCE_DIR}/../SALOMETraceCollector/Test
- ${
CMAKE
_BINARY_DIR}/idl
+ ${
PROJECT
_BINARY_DIR}/idl
)
SET(SCRIPTS
)
SET(SCRIPTS
@@
-43,7
+42,7
@@
SET(SCRIPTS
SALOME_Container.py
)
SALOME_Container.py
)
-ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${
LIBXML2_DEFINITIONS} ${
OMNIORB_DEFINITIONS})
+ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${OMNIORB_DEFINITIONS})
SET(COMMON_LIBS
Registry
SalomeNotification
SET(COMMON_LIBS
Registry
SalomeNotification
@@
-61,19
+60,17
@@
SET(COMMON_LIBS
)
IF(WITH_MPI_SEQ_CONTAINER)
)
IF(WITH_MPI_SEQ_CONTAINER)
- ADD_DEFINITIONS(${MPI_
CXX_COMPILE_FLAG
S})
+ ADD_DEFINITIONS(${MPI_
DEFINITION
S})
SET(COMMON_LIBS
${MPI_CXX_LIBRARIES}
)
ENDIF(WITH_MPI_SEQ_CONTAINER)
SET(COMMON_LIBS
${MPI_CXX_LIBRARIES}
)
ENDIF(WITH_MPI_SEQ_CONTAINER)
-IF(WITH_PACO_PARALLEL)
- ADD_DEFINITIONS(-DWITH_PACO_PARALLEL ${PACO_DEFINITIONS})
- SET(COMMON_LIBS
- ${COMMON_LIBS}
- ${PACO_LIBS}
- )
-ENDIF(WITH_PACO_PARALLEL)
+IF(SALOME_PACO_PARALLEL)
+ INCLUDE_DIRECTORIES(${PACO_INCLUDE_DIRS})
+ ADD_DEFINITIONS(-DWITH_PACO_PARALLEL)
+ LIST(APPEND COMMON_LIBS ${PACO_LIBRARIES})
+ENDIF()
SET(SalomeContainer_SOURCES
Component_i.cxx
SET(SalomeContainer_SOURCES
Component_i.cxx
@@
-86,26
+83,27
@@
SET(SalomeContainer_SOURCES
)
ADD_LIBRARY(SalomeContainer ${SalomeContainer_SOURCES})
)
ADD_LIBRARY(SalomeContainer ${SalomeContainer_SOURCES})
-TARGET_LINK_LIBRARIES(SalomeContainer ${COMMON_LIBS})
-INSTALL(TARGETS SalomeContainer
DESTINATION ${KERNEL_salomelib
_LIBS})
+TARGET_LINK_LIBRARIES(SalomeContainer ${COMMON_LIBS}
${PTHREAD_LIBRARIES}
)
+INSTALL(TARGETS SalomeContainer
EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL
_LIBS})
SET(SALOME_Container_LIBS
SalomeContainer
SALOMEBasics
${COMMON_LIBS}
${HDF5_LIBRARIES}
SET(SALOME_Container_LIBS
SalomeContainer
SALOMEBasics
${COMMON_LIBS}
${HDF5_LIBRARIES}
+ ${MPI_LIBRARIES}
)
ADD_EXECUTABLE(SALOME_Container SALOME_Container.cxx SALOME_Container_SignalsHandler.cxx)
TARGET_LINK_LIBRARIES(SALOME_Container ${SALOME_Container_LIBS})
)
ADD_EXECUTABLE(SALOME_Container SALOME_Container.cxx SALOME_Container_SignalsHandler.cxx)
TARGET_LINK_LIBRARIES(SALOME_Container ${SALOME_Container_LIBS})
-IF(SALOME_
USE_TEST
)
+IF(SALOME_
BUILD_TESTS
)
ADD_EXECUTABLE(TestSalome_file TestSalome_file.cxx)
TARGET_LINK_LIBRARIES(TestSalome_file SALOMETraceCollectorTest ${SALOME_Container_LIBS})
ADD_EXECUTABLE(TestSalome_file TestSalome_file.cxx)
TARGET_LINK_LIBRARIES(TestSalome_file SALOMETraceCollectorTest ${SALOME_Container_LIBS})
-ENDIF(
SALOME_USE_TEST
)
-INSTALL(TARGETS SALOME_Container DESTINATION ${
KERNEL_salomebin
_BINS})
+ENDIF()
+INSTALL(TARGETS SALOME_Container DESTINATION ${
SALOME_INSTALL
_BINS})
# Executable scripts to be installed
# Executable scripts to be installed
-SALOME_INSTALL_SCRIPTS("${SCRIPTS}" ${
KERNEL_salomescript
_PYTHON})
+SALOME_INSTALL_SCRIPTS("${SCRIPTS}" ${
SALOME_INSTALL_SCRIPT
_PYTHON})
FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
-INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${
KERNEL_salomeinclude
_HEADERS})
+INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${
SALOME_INSTALL
_HEADERS})