Merge from V6_main (04/10/2012)

[modules/med.git] / src / MEDWrapper / V2_2 / CMakeLists.txt

diff --git a/src/MEDWrapper/V2_2/CMakeLists.txt b/src/MEDWrapper/V2_2/CMakeLists.txt
index 61681f5d08561a797c261844f20d777f0be41dd4..351584b2d467cb558f88ff356b1830adfe48d005 100644 (file)
--- a/src/MEDWrapper/V2_2/CMakeLists.txt
+++ b/src/MEDWrapper/V2_2/CMakeLists.txt
@@ -31,11 +31,11 @@ SET(MEDWrapper_V2_2_SOURCES
 IF(MED_ENABLE_KERNEL)
   INCLUDE_DIRECTORIES(${KERNEL_ROOT_DIR}/include/salome)
 ELSE(MED_ENABLE_KERNEL)
-  INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/adm_local_without_kernel/unix)
+  INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/adm_local_without_kernel)
 ENDIF(MED_ENABLE_KERNEL)
 
 ADD_LIBRARY(MEDWrapper_V2_2 SHARED ${MEDWrapper_V2_2_SOURCES})
-SET_TARGET_PROPERTIES(MEDWrapper_V2_2 PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${BOOST_DEFINITIONS}")
+SET_TARGET_PROPERTIES(MEDWrapper_V2_2 PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${BOOST_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
 TARGET_LINK_LIBRARIES(MEDWrapper_V2_2 MEDWrapperBase ${MED3_LIBS_C_ONLY} ${HDF5_LIBS})
 INSTALL(TARGETS MEDWrapper_V2_2 DESTINATION ${MED_salomelib_LIBS})