1
1

Get rid of a warning when built with VS Express.

Fix the command option for dumpbin.

This commit was SVN r24834.
Этот коммит содержится в:
Shiqing Fan 2011-06-29 14:24:37 +00:00
родитель 418229c71c
Коммит cefb2473c2
3 изменённых файлов: 7 добавлений и 2 удалений

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

@ -115,6 +115,11 @@ SET(ENV{PATH} "${PATH_OLD}")
SET(ENV{LIB} "${LIB_OLD}")
SET(ENV{INCLUDE} "${INCLUDE_OLD}")
# By default, do not warn when built on machines using only VS Express
IF(NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
ENDIF(NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
INCLUDE(InstallRequiredSystemLibraries)
# CPACK settings

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

@ -38,7 +38,7 @@ MACRO(OMPI_F77_FIND_EXT_SYMBOL_CONVENTION)
SET(OUTPUT_OBJ_FILE "conftest.lib")
# now run dumpbin to generate an output file
EXECUTE_PROCESS(COMMAND ${DUMP_UTIL} ${OUTPUT_OBJ_FILE}
EXECUTE_PROCESS(COMMAND ${DUMP_UTIL} ${OUTPUT_OBJ_FILE} ${DUMP_UTIL_OPT}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
OUTPUT_VARIABLE DUMP_OUTPUT
RESULT_VARIABLE RESULT

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

@ -136,7 +136,7 @@ IF(NOT MICROSOFT_CHECK_DONE)
"Output option for making static libraries.")
SET(DUMP_UTIL "${VC_BIN_PATH}/dumpbin.exe" CACHE INTERNAL "the dumpbin application.")
SET(DUMP_UTIL_OPT "/symbols /out:" CACHE INTERNAL "the dumpbin application options.")
SET(DUMP_UTIL_OPT "/symbols" CACHE INTERNAL "the dumpbin application options.")
FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/cl_test.c
"int main() {return 0;}")