1
1

Clean up some unnecessary compiler flags.

This commit was SVN r20827.
Этот коммит содержится в:
Shiqing Fan 2009-03-18 16:55:34 +00:00
родитель 2815cb88b4
Коммит 22b5c536af

Просмотреть файл

@ -15,12 +15,12 @@ ADD_SUBDIRECTORY(ompi-server)
SET(OMPI_WRAPPER_EXTRA_LIBS "advapi32.lib Ws2_32.lib shlwapi.lib")
GET_FILENAME_COMPONENT(CC "${CL_EXE}" NAME)
IF(BUILD_SHARED_LIBS)
SET(OMPI_WRAPPER_EXTRA_CFLAGS
"/MDd /TC /D \"OMPI_IMPORTS\" /D \"OPAL_IMPORTS\" /D \"ORTE_IMPORTS\"")
ELSE(BUILD_SHARED_LIBS)
SET(OMPI_WRAPPER_EXTRA_CFLAGS "/MDd /TC")
ENDIF(BUILD_SHARED_LIBS)
IF(BUILD_SHARED_LIBS)
SET(OMPI_WRAPPER_EXTRA_CFLAGS
"/TC /D \"OMPI_IMPORTS\" /D \"OPAL_IMPORTS\" /D \"ORTE_IMPORTS\"")
ELSE(BUILD_SHARED_LIBS)
SET(OMPI_WRAPPER_EXTRA_CFLAGS "/TC")
ENDIF(BUILD_SHARED_LIBS)
CONFIGURE_FILE(${OpenMPI_SOURCE_DIR}/contrib/platform/win32/ConfigFiles/mpicc-wrapper-data.txt.cmake
${OMPI_BINARY_DIR}/tools/wrappers/mpicc-wrapper-data.txt @ONLY)
@ -33,11 +33,12 @@ INSTALL(FILES ${OMPI_BINARY_DIR}/tools/wrappers/mpicc.exe-wrapper-data.txt
IF(OMPI_WANT_CXX_BINDINGS)
GET_FILENAME_COMPONENT(CXX "${CL_EXE}" NAME)
IF(BUILD_SHARED_LIBS)
SET(OMPI_WRAPPER_EXTRA_CXXFLAGS
"/MDd /TP /EHsc /D \"OMPI_IMPORTS\" /D \"OPAL_IMPORTS\" /D \"ORTE_IMPORTS\"")
"/TP /EHsc /D \"OMPI_IMPORTS\" /D \"OPAL_IMPORTS\" /D \"ORTE_IMPORTS\"")
ELSE(BUILD_SHARED_LIBS)
SET(OMPI_WRAPPER_EXTRA_CXXFLAGS "/MDd /TP /EHsc /D")
SET(OMPI_WRAPPER_EXTRA_CXXFLAGS "/TP /EHsc")
ENDIF(BUILD_SHARED_LIBS)
SET(OMPI_WRAPPER_CXX_LIB "libmpi_cxx.lib")
CONFIGURE_FILE(${OpenMPI_SOURCE_DIR}/contrib/platform/win32/ConfigFiles/mpic++-wrapper-data.txt.cmake