Salome HOME
projects
/
tools
/
medcoupling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New CMake implementation
[tools/medcoupling.git]
/
src
/
MEDCouplingCorba
/
CMakeLists.txt
diff --git
a/src/MEDCouplingCorba/CMakeLists.txt
b/src/MEDCouplingCorba/CMakeLists.txt
index 7b0b7bb52046b12a8b0f3b5a63a0dd1b11d7372b..b62e5896ab60d44a6c385ef18d035166a8b9eb78 100644
(file)
--- a/
src/MEDCouplingCorba/CMakeLists.txt
+++ b/
src/MEDCouplingCorba/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 20
07-2012
CEA/DEN, EDF R&D
+# Copyright (C) 20
12-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
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-18,14
+18,16
@@
#
# Author : Anthony Geay (CEA/DEN)
#
# Author : Anthony Geay (CEA/DEN)
+ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${PLATFORM_DEFINITIONS})
+
ADD_SUBDIRECTORY(Client)
ADD_SUBDIRECTORY(Client)
-IF
(CPPUNIT_IS_OK
)
+IF
(SALOME_BUILD_TESTS
)
ADD_SUBDIRECTORY(Test)
ADD_SUBDIRECTORY(Test)
-ENDIF
(CPPUNIT_IS_OK
)
+ENDIF
(SALOME_BUILD_TESTS
)
INCLUDE_DIRECTORIES(
INCLUDE_DIRECTORIES(
- ${OMNIORB_INCLUDE_DIRS}
+ ${OMNIORB_INCLUDE_DIR
} ${OMNIORB_INCLUDE_DIR
S}
${KERNEL_ROOT_DIR}/include/salome
${CMAKE_CURRENT_BINARY_DIR}/../../idl
${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling
${KERNEL_ROOT_DIR}/include/salome
${CMAKE_CURRENT_BINARY_DIR}/../../idl
${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling
@@
-53,9
+55,11
@@
SET(medcouplingcorba_SOURCES
)
ADD_LIBRARY(medcouplingcorba SHARED ${medcouplingcorba_SOURCES})
)
ADD_LIBRARY(medcouplingcorba SHARED ${medcouplingcorba_SOURCES})
-SET_TARGET_PROPERTIES(medcouplingcorba PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
TARGET_LINK_LIBRARIES(medcouplingcorba medcoupling SalomeIDLMED ${PLATFORM_LIBS})
TARGET_LINK_LIBRARIES(medcouplingcorba medcoupling SalomeIDLMED ${PLATFORM_LIBS})
-INSTALL(TARGETS medcouplingcorba DESTINATION ${
MED_salomelib
_LIBS})
+INSTALL(TARGETS medcouplingcorba DESTINATION ${
SALOME_INSTALL
_LIBS})
FILE(GLOB medcouplingcorba_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
FILE(GLOB medcouplingcorba_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
-INSTALL(FILES ${medcouplingcorba_HEADERS_HXX} DESTINATION ${MED_salomeinclude_HEADERS})
+INSTALL(FILES ${medcouplingcorba_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})
+
+# To allow usage as SWIG dependencies:
+SET(medcouplingcorba_HEADERS_HXX PARENT_SCOPE)