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
Some additional exports.
[tools/medcoupling.git]
/
src
/
MEDCouplingCorba
/
Test
/
CMakeLists.txt
diff --git
a/src/MEDCouplingCorba/Test/CMakeLists.txt
b/src/MEDCouplingCorba/Test/CMakeLists.txt
index f376122165ff6adea0606a6e42856845a1de3ed0..8e1639034900485bb2ddce6cc204232a22082237 100644
(file)
--- a/
src/MEDCouplingCorba/Test/CMakeLists.txt
+++ b/
src/MEDCouplingCorba/Test/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
@@
-16,9
+16,12
@@
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
+# Author : Anthony Geay (CEA/DEN)
INCLUDE_DIRECTORIES(
INCLUDE_DIRECTORIES(
- ${OMNIORB_INCLUDE_DIRS}
+ ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
+ ${PTHREAD_INCLUDE_DIRS}
+ ${CPPUNIT_INCLUDE_DIRS}
${KERNEL_ROOT_DIR}/include/salome
${CMAKE_CURRENT_BINARY_DIR}/../../../idl
${CMAKE_CURRENT_SOURCE_DIR}/..
${KERNEL_ROOT_DIR}/include/salome
${CMAKE_CURRENT_BINARY_DIR}/../../../idl
${CMAKE_CURRENT_SOURCE_DIR}/..
@@
-35,8
+38,7
@@
SET(TestMEDCouplingCorbaServ_SOURCES
)
ADD_EXECUTABLE(TestMEDCouplingCorbaServ ${TestMEDCouplingCorbaServ_SOURCES})
)
ADD_EXECUTABLE(TestMEDCouplingCorbaServ ${TestMEDCouplingCorbaServ_SOURCES})
-SET_TARGET_PROPERTIES(TestMEDCouplingCorbaServ PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS}")
-TARGET_LINK_LIBRARIES(TestMEDCouplingCorbaServ medcouplingcorba SalomeIDLMEDTests ${OMNIORB_LIBS})
+TARGET_LINK_LIBRARIES(TestMEDCouplingCorbaServ medcouplingcorba SalomeIDLMEDTests ${OMNIORB_LIBRARIES} ${PLATFORM_LIBRARIES})
SET(TestMEDCouplingCorbaClt_SOURCES
TestMEDCouplingCorbaClt.cxx
SET(TestMEDCouplingCorbaClt_SOURCES
TestMEDCouplingCorbaClt.cxx
@@
-45,7
+47,7
@@
SET(TestMEDCouplingCorbaClt_SOURCES
)
ADD_EXECUTABLE(TestMEDCouplingCorbaClt ${TestMEDCouplingCorbaClt_SOURCES})
)
ADD_EXECUTABLE(TestMEDCouplingCorbaClt ${TestMEDCouplingCorbaClt_SOURCES})
-SET_TARGET_PROPERTIES(TestMEDCouplingCorbaClt PROPERTIES COMPILE_FLAGS "${
OMNIORB_DEFINITIONS} ${
CPPUNIT_DEFINITIONS}")
-TARGET_LINK_LIBRARIES(TestMEDCouplingCorbaClt medcouplingclient SalomeIDLMEDTests ${OMNIORB_LIB
S} ${CPPUNIT_LIB
S})
+SET_TARGET_PROPERTIES(TestMEDCouplingCorbaClt PROPERTIES COMPILE_FLAGS "${CPPUNIT_DEFINITIONS}")
+TARGET_LINK_LIBRARIES(TestMEDCouplingCorbaClt medcouplingclient SalomeIDLMEDTests ${OMNIORB_LIB
RARIES} ${CPPUNIT_LIBRARIES} ${PLATFORM_LIBRARIES} ${PTHREAD_LIBRARIE
S})
-INSTALL(TARGETS TestMEDCouplingCorbaServ TestMEDCouplingCorbaClt DESTINATION ${
MED_salomebin
_BINS})
+INSTALL(TARGETS TestMEDCouplingCorbaServ TestMEDCouplingCorbaClt DESTINATION ${
SALOME_INSTALL
_BINS})