Set the compile flags for F77 on Windows more correctly.
This commit was SVN r22774.
Этот коммит содержится в:
родитель
5b9515225d
Коммит
4c1fc87502
@ -57,9 +57,9 @@ ADD_LIBRARY(libmpi_f77 ${OMPI_F77_FILES} ${OMPI_F77_HEADER_FILES})
|
||||
TARGET_LINK_LIBRARIES(libmpi_f77 libmpi)
|
||||
|
||||
IF(BUILD_SHARED_LIBS)
|
||||
ADD_DEFINITIONS(-D_USRDLL -DOMPI_PROFILE_LAYER=0 -DOMPI_COMPILING_F77_WRAPPERS=1 -DOMPI_EXPORTS)
|
||||
ADD_DEFINITIONS(-D_USRDLL -DOMPI_IMPORTS /TP)
|
||||
ELSE(BUILD_SHARED_LIBS)
|
||||
ADD_DEFINITIONS(-D_LIB -DOMPI_PROFILE_LAYER=0 -DOMPI_COMPILING_F77_WRAPPERS=1)
|
||||
ADD_DEFINITIONS(-D_LIB)
|
||||
ENDIF(BUILD_SHARED_LIBS)
|
||||
|
||||
INSTALL(TARGETS libmpi_f77
|
||||
|
@ -78,9 +78,9 @@ IF(OMPI_WANT_CXX_BINDINGS)
|
||||
|
||||
# select debug or release libraries at configure time
|
||||
IF(OMPI_DEBUG_BUILD)
|
||||
SET(OMPI_WRAPPER_CXX_LIB "libmpi_cxxd.lib" ${OMPI_WRAPPER_BASE_LIBS})
|
||||
SET(OMPI_WRAPPER_CXX_LIB "libmpi_cxxd.lib ${OMPI_WRAPPER_BASE_LIBS}")
|
||||
ELSE(OMPI_DEBUG_BUILD)
|
||||
SET(OMPI_WRAPPER_CXX_LIB "libmpi_cxx.lib" ${OMPI_WRAPPER_BASE_LIBS})
|
||||
SET(OMPI_WRAPPER_CXX_LIB "libmpi_cxx.lib ${OMPI_WRAPPER_BASE_LIBS}")
|
||||
ENDIF(OMPI_DEBUG_BUILD)
|
||||
|
||||
CONFIGURE_WRAPPER_DATA_FILE(mpic++)
|
||||
@ -101,9 +101,9 @@ IF(OMPI_WANT_F77_BINDINGS)
|
||||
|
||||
# select debug or release libraries at configure time
|
||||
IF(OMPI_DEBUG_BUILD)
|
||||
SET(OMPI_WRAPPER_EXTRA_LIBS "libmpi_f77d.lib" ${OMPI_WRAPPER_BASE_LIBS})
|
||||
SET(OMPI_WRAPPER_EXTRA_LIBS "libmpi_f77d.lib ${OMPI_WRAPPER_BASE_LIBS}")
|
||||
ELSE(OMPI_DEBUG_BUILD)
|
||||
SET(OMPI_WRAPPER_EXTRA_LIBS "libmpi_f77.lib" ${OMPI_WRAPPER_BASE_LIBS})
|
||||
SET(OMPI_WRAPPER_EXTRA_LIBS "libmpi_f77.lib ${OMPI_WRAPPER_BASE_LIBS}")
|
||||
ENDIF(OMPI_DEBUG_BUILD)
|
||||
CONFIGURE_WRAPPER_DATA_FILE(mpif77)
|
||||
UNSET(OMPI_WRAPPER_EXTRA_LIBS)
|
||||
|
Загрузка…
Ссылка в новой задаче
Block a user