From: ageay Date: Thu, 4 Jul 2013 13:14:00 +0000 (+0000) Subject: Windows porting X-Git-Tag: B4CMakeModifs~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4fa64f563f274db158e0270bb87df69006813379;p=modules%2Fmed.git Windows porting --- diff --git a/src/INTERP_KERNEL/CMakeLists.txt b/src/INTERP_KERNEL/CMakeLists.txt index f37a2d1b6..e9f05fe0d 100644 --- a/src/INTERP_KERNEL/CMakeLists.txt +++ b/src/INTERP_KERNEL/CMakeLists.txt @@ -67,9 +67,9 @@ INCLUDE_DIRECTORIES( ) SET(PLATFORM_MMAP) -IF(NOT WINDOWS) +IF(NOT WIN32) SET(PLATFORM_MMAP "-D_POSIX_MAPPED_FILES") -ENDIF(NOT WINDOWS) +ENDIF(NOT WIN32) ADD_LIBRARY(interpkernel SHARED ${interpkernel_SOURCES}) SET_TARGET_PROPERTIES(interpkernel PROPERTIES COMPILE_FLAGS "${PLATFORM_DEFINITIONS} ${PLATFORM_MMAP}") diff --git a/src/MEDLoader/Swig/CMakeLists.txt b/src/MEDLoader/Swig/CMakeLists.txt index d473ae001..41f354a7c 100644 --- a/src/MEDLoader/Swig/CMakeLists.txt +++ b/src/MEDLoader/Swig/CMakeLists.txt @@ -56,9 +56,9 @@ SET (SWIG_MODULE_MEDLoader_EXTRA_DEPS ${MEDLoader_SWIG_DPYS_FILES} SWIG_ADD_MODULE(MEDLoader python MEDLoader.i) SWIG_LINK_LIBRARIES(MEDLoader ${PYTHON_LIBS} ${PLATFORM_LIBS} medloader medcoupling) SET_TARGET_PROPERTIES(_MEDLoader PROPERTIES COMPILE_FLAGS "${PLATFORM_DEFINITIONS} ${PYTHON_DEFINITIONS}") -IF(${MACHINE} STREQUAL WINDOWS) +IF(WIN32) SET_TARGET_PROPERTIES(_MEDLoader PROPERTIES DEBUG_OUTPUT_NAME _MEDLoader_d) -ENDIF(${MACHINE} STREQUAL WINDOWS) +ENDIF(WIN32) INSTALL(TARGETS _MEDLoader DESTINATION ${MED_salomelib_LIBS}) INSTALL(FILES MEDLoader.i MEDLoaderTypemaps.i MEDLoaderCommon.i DESTINATION ${MED_salomeinclude_HEADERS})