From 21db13a17a1b9632c737481f446d9fa1ca6d1361 Mon Sep 17 00:00:00 2001 From: Shiqing Fan Date: Wed, 27 Oct 2010 15:06:15 +0000 Subject: [PATCH] Fix the CMake error that caused by unexpected empty string. This commit was SVN r23960. --- contrib/platform/win32/CMakeModules/ompi_define.cmake | 2 +- contrib/platform/win32/CMakeModules/opal_get_version.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/platform/win32/CMakeModules/ompi_define.cmake b/contrib/platform/win32/CMakeModules/ompi_define.cmake index 7a3566c3a2..80e9d3ffd2 100644 --- a/contrib/platform/win32/CMakeModules/ompi_define.cmake +++ b/contrib/platform/win32/CMakeModules/ompi_define.cmake @@ -68,7 +68,7 @@ MACRO(OMPI_DEF NAME VALUE DESC IS_STR FORCE_DEF) SET(${NAME} ${VALUE}) - APPEND_CONFIG_FILE(${NAME} ${NAME} ${VALUE} ${DESC} ${IS_STR} ${FORCE_DEF} 0) + APPEND_CONFIG_FILE(${NAME} ${NAME} "${VALUE}" ${DESC} ${IS_STR} ${FORCE_DEF} 0) ENDMACRO(OMPI_DEF NAME VALUE DESC IS_STR FORCE_DEF) diff --git a/contrib/platform/win32/CMakeModules/opal_get_version.cmake b/contrib/platform/win32/CMakeModules/opal_get_version.cmake index eec33f5437..0dab5e1cb1 100644 --- a/contrib/platform/win32/CMakeModules/opal_get_version.cmake +++ b/contrib/platform/win32/CMakeModules/opal_get_version.cmake @@ -91,7 +91,7 @@ ENDIF("${WANT_SVN}" STREQUAL "1") # Set opal versions SET(OPAL_WANT_SVN ${WANT_SVN}) SET(OPAL_SVN_R ${SVN_R}) -OMPI_DEF(OPAL_GREEK_VERSION ${GREEK_VERSION} "Greek - alpha, beta, etc - release number of Open Portable Access Layer." 1 1) +OMPI_DEF(OPAL_GREEK_VERSION "${GREEK_VERSION}" "Greek - alpha, beta, etc - release number of Open Portable Access Layer." 1 1) OMPI_DEF(OPAL_MAJOR_VERSION ${MAJOR_VERSION} "Major release number of Open Portable Access Layer." 0 1) OMPI_DEF(OPAL_MINOR_VERSION ${MINOR_VERSION} "Minor release number of Open Portable Access Layer." 0 1) OMPI_DEF(OPAL_RELEASE_VERSION ${RELEASE_VERSION} "Release number of Open Portable Access Layer." 0 1) @@ -101,7 +101,7 @@ OMPI_DEF(OPAL_IDENT_STRING ${VERSION_STRING} "ident string for Open MPI." 1 1) # Set OMPI versions SET(OMPI_WANT_SVN ${WANT_SVN}) SET(OMPI_SVN_R ${SVN_R}) -OMPI_DEF(OMPI_GREEK_VERSION ${GREEK_VERSION} "Greek - alpha, beta, etc - release number of Open Portable Access Layer." 1 1) +OMPI_DEF(OMPI_GREEK_VERSION "${GREEK_VERSION}" "Greek - alpha, beta, etc - release number of Open Portable Access Layer." 1 1) OMPI_DEF(OMPI_MAJOR_VERSION ${MAJOR_VERSION} "Major release number of Open MPI." 0 1) OMPI_DEF(OMPI_MINOR_VERSION ${MINOR_VERSION} "Minor release number of Open MPI." 0 1) OMPI_DEF(OMPI_RELEASE_VERSION ${RELEASE_VERSION} "Release number of Open MPI." 0 1) @@ -110,7 +110,7 @@ OMPI_DEF(OMPI_VERSION ${VERSION_STRING} "Complete release number of Open MPI." 1 # Set ORTE versions SET(ORTE_WANT_SVN ${WANT_SVN}) SET(ORTE_SVN_R ${SVN_R}) -OMPI_DEF(ORTE_GREEK_VERSION ${GREEK_VERSION} "Greek - alpha, beta, etc - release number of Open Run-Time Environment." 1 1) +OMPI_DEF(ORTE_GREEK_VERSION "${GREEK_VERSION}" "Greek - alpha, beta, etc - release number of Open Run-Time Environment." 1 1) OMPI_DEF(ORTE_MAJOR_VERSION ${MAJOR_VERSION} "Major release number of Open Run-Time Environment." 0 1) OMPI_DEF(ORTE_MINOR_VERSION ${MINOR_VERSION} "Minor release number of Open Run-Time Environment." 0 1) OMPI_DEF(ORTE_RELEASE_VERSION ${RELEASE_VERSION} "Release number of Open Run-Time Environment." 0 1)