Use variables instead of hard-coded compiler flags, in order to support various C/C++ compilers on Windows.

This commit was SVN r23016.
2010-04-21 12:45:00 +00:00 · 2010-04-21 12:45:00 +00:00 · d1e66bdd01
--- a/contrib/platform/win32/CMakeModules/ompi_check_Microsoft.cmake
+++ b/contrib/platform/win32/CMakeModules/ompi_check_Microsoft.cmake
@ -90,6 +90,20 @@ IF(NOT MICROSOFT_CHECK_DONE)
    "C compiler option for setting object file name.")
  SET(OMPI_C_OUTPUT_EXE "/Fe" CACHE INTERNAL
    "C compiler option for setting executable file name.")
+  SET(OMPI_C_LAN_FLAG "/TC" CACHE INTERNAL
+    "C compiler option for compiling source as C.")
+  SET(OMPI_CXX_LAN_FLAG "/TP" CACHE INTERNAL
+    "C compiler option for compiling source as C++.")
+  SET(OMPI_C_DEF_PRE "/D" CACHE INTERNAL
+    "C compiler option for preprocessor definition.")
+  SET(OMPI_C_MD_DEBUG "/MDd" CACHE INTERNAL
+    "C compiler option for Multi-thread Debug DLL.")
+  SET(OMPI_C_MD "/MD" CACHE INTERNAL
+    "C compiler option for Multi-thread DLL.")
+  SET(OMPI_CXX_EXCEPTION "/EHsc" CACHE INTERNAL
+    "C compiler option for C++ exceptions.")
+  SET(OMPI_C_INCLUDE_DIR "/I" CACHE INTERNAL
+    "C compiler option for including directory.")

  SET(DUMP_UTIL "${VC_BIN_PATH}/dumpbin.exe" CACHE INTERNAL "the dumpbin application.")

--- a/ompi/CMakeLists.txt
+++ b/ompi/CMakeLists.txt
@ -105,7 +105,7 @@ IF(OMPI_WANT_F77_BINDINGS)
  # Fortran 77 glue into libmpi
  FILE(GLOB OMPI_F77_BASE_FILES "mpi/f77/base/*.c")
  SET_SOURCE_FILES_PROPERTIES(${OMPI_F77_BASE_FILES} 
-                              PROPERTIES COMPILE_FLAGS "-DOMPI_COMPILING_F77_WRAPPERS=1 -DOMPI_PROFILE_LAYER=0")
+                              PROPERTIES COMPILE_FLAGS "${OMPI_C_DEF_PRE}OMPI_COMPILING_F77_WRAPPERS=1 ${OMPI_C_DEF_PRE}OMPI_PROFILE_LAYER=0")
  SET(OMPI_SOURCE_FILES ${OMPI_SOURCE_FILES} ${OMPI_F77_BASE_FILES})
  SOURCE_GROUP(mpi\\f77\\base FILES ${OMPI_F77_BASE_FILES})
 ENDIF(OMPI_WANT_F77_BINDINGS)
@ -117,18 +117,19 @@ SET (OMPI_SOURCE_FILES ${OMPI_SOURCE_FILES} ${MCA_FILES})
 ADD_LIBRARY (libmpi ${OMPI_SOURCE_FILES})

 SET_TARGET_PROPERTIES(libmpi PROPERTIES COMPILE_FLAGS 
-                      "-DOMPI_MPIHANDLES_DLL_PREFIX=libompi_dbg_mpihandles
-                       -DOMPI_MSGQ_DLL_PREFIX=libompi_dbg_msgq
-                       -DOMPI_BUILDING 
-                       -DOMPI_BUILDING_CXX_BINDINGS_LIBRARY")
+                      "${OMPI_C_DEF_PRE}OMPI_MPIHANDLES_DLL_PREFIX=libompi_dbg_mpihandles
+                       ${OMPI_C_DEF_PRE}OMPI_MSGQ_DLL_PREFIX=libompi_dbg_msgq
+                       ${OMPI_C_DEF_PRE}OMPI_BUILDING 
+                       ${OMPI_C_DEF_PRE}OMPI_BUILDING_CXX_BINDINGS_LIBRARY")

 # Set compile flags for this target
 IF (BUILD_SHARED_LIBS)
  SET_TARGET_PROPERTIES(libmpi PROPERTIES 
-    COMPILE_FLAGS "-D_USRDLL -DHAVE_CONFIG_H -DOMPI_EXPORTS /TP")
+    COMPILE_FLAGS "${OMPI_C_DEF_PRE}_USRDLL ${OMPI_C_DEF_PRE}HAVE_CONFIG_H
+                   ${OMPI_C_DEF_PRE}OMPI_EXPORTS ${OMPI_CXX_LAN_FLAG}")
  TARGET_LINK_LIBRARIES (libmpi libopen-rte Ws2_32.lib shlwapi.lib)
 ELSE (BUILD_SHARED_LIBS)
-  SET_TARGET_PROPERTIES(libmpi PROPERTIES COMPILE_FLAGS "-D_LIB")
+  SET_TARGET_PROPERTIES(libmpi PROPERTIES COMPILE_FLAGS "${OMPI_C_DEF_PRE}_LIB")
 ENDIF(BUILD_SHARED_LIBS)

 # generate ompi_config.h
--- a/ompi/mpi/f77/CMakeLists.txt
+++ b/ompi/mpi/f77/CMakeLists.txt
@ -26,7 +26,7 @@ IF (NOT OMPI_PROVIDE_MPI_FILE_INTERFACE)
 ENDIF(NOT OMPI_PROVIDE_MPI_FILE_INTERFACE)

 SET_SOURCE_FILES_PROPERTIES(${OMPI_F77_FILES} PROPERTIES
-  COMPILE_FLAGS "-DOMPI_PROFILE_LAYER=0 -DOMPI_COMPILING_F77_WRAPPERS=1")
+  COMPILE_FLAGS "${OMPI_C_DEF_PRE}OMPI_PROFILE_LAYER=0 ${OMPI_C_DEF_PRE}OMPI_COMPILING_F77_WRAPPERS=1")

 IF(OMPI_ENABLE_MPI_PROFILING)
  # As weak symbols are not supported by MS compiler,
@ -43,7 +43,7 @@ IF(OMPI_ENABLE_MPI_PROFILING)
  FILE(GLOB OMPI_F77_PROFILE_FILES "${PROJECT_BINARY_DIR}/profile/*.c" )

  SET_SOURCE_FILES_PROPERTIES(${OMPI_F77_PROFILE_FILES} PROPERTIES 
-    COMPILE_FLAGS "-DOMPI_PROFILE_LAYER=1 -DOMPI_COMPILING_F77_WRAPPERS=1")
+    COMPILE_FLAGS "${OMPI_C_DEF_PRE}OMPI_PROFILE_LAYER=1 ${OMPI_C_DEF_PRE}OMPI_COMPILING_F77_WRAPPERS=1")

  SET(OMPI_F77_FILES ${OMPI_F77_FILES} ${OMPI_F77_PROFILE_FILES})
  SOURCE_GROUP(profile FILES  ${OMPI_F77_PROFILE_FILES})
@ -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_IMPORTS /TP)
+  ADD_DEFINITIONS(${OMPI_C_DEF_PRE}_USRDLL ${OMPI_C_DEF_PRE}OMPI_IMPORTS ${OMPI_CXX_LAN_FLAG})
 ELSE(BUILD_SHARED_LIBS)
-  ADD_DEFINITIONS(-D_LIB)
+  ADD_DEFINITIONS(${OMPI_C_DEF_PRE}_LIB)
 ENDIF(BUILD_SHARED_LIBS)

 INSTALL(TARGETS libmpi_f77
--- a/ompi/tools/CMakeLists.txt
+++ b/ompi/tools/CMakeLists.txt
@ -51,12 +51,12 @@ ENDIF(OMPI_DEBUG_BUILD)

 IF(BUILD_SHARED_LIBS)
  SET(OMPI_WRAPPER_EXTRA_CFLAGS
-    "/TC /D \"OMPI_IMPORTS\" /D \"OPAL_IMPORTS\" /D \"ORTE_IMPORTS\"")
+    "${OMPI_C_LAN_FLAG} ${OMPI_C_DEF_PRE}OMPI_IMPORTS ${OMPI_C_DEF_PRE}OPAL_IMPORTS ${OMPI_C_DEF_PRE}ORTE_IMPORTS")
 ELSE(BUILD_SHARED_LIBS)
  IF(OMPI_DEBUG_BUILD)
-    SET(OMPI_WRAPPER_EXTRA_CFLAGS "/TC /MDd")
+    SET(OMPI_WRAPPER_EXTRA_CFLAGS "${OMPI_C_LAN_FLAG} ${OMPI_C_MD_DEBUG}")
  ELSE(OMPI_DEBUG_BUILD)
-    SET(OMPI_WRAPPER_EXTRA_CFLAGS "/TC /MD")
+    SET(OMPI_WRAPPER_EXTRA_CFLAGS "${OMPI_C_LAN_FLAG} ${OMPI_C_MD}")
  ENDIF(OMPI_DEBUG_BUILD)
 ENDIF(BUILD_SHARED_LIBS)

@ -67,12 +67,12 @@ UNSET(OMPI_WRAPPER_EXTRA_LIBS)
 IF(OMPI_WANT_CXX_BINDINGS)
  IF(BUILD_SHARED_LIBS)
    SET(OMPI_WRAPPER_EXTRA_CXXFLAGS 
-      "/TP /EHsc /D \"OMPI_IMPORTS\" /D \"OPAL_IMPORTS\" /D \"ORTE_IMPORTS\"")
+      "${OMPI_CXX_LAN_FLAG} ${OMPI_CXX_EXCEPTION} ${OMPI_C_DEF_PRE}OMPI_IMPORTS ${OMPI_C_DEF_PRE}OPAL_IMPORTS ${OMPI_C_DEF_PRE}ORTE_IMPORTS")
  ELSE(BUILD_SHARED_LIBS)
    IF(OMPI_DEBUG_BUILD)
-      SET(OMPI_WRAPPER_EXTRA_CXXFLAGS "/TP /EHsc /MDd")
+      SET(OMPI_WRAPPER_EXTRA_CXXFLAGS "${OMPI_CXX_LAN_FLAG} ${OMPI_CXX_EXCEPTION} ${OMPI_C_MD_DEBUG}")
    ELSE(OMPI_DEBUG_BUILD)
-      SET(OMPI_WRAPPER_EXTRA_CXXFLAGS "/TP /EHsc /MD")
+      SET(OMPI_WRAPPER_EXTRA_CXXFLAGS "${OMPI_CXX_LAN_FLAG} ${OMPI_CXX_EXCEPTION} ${OMPI_C_MD}")
    ENDIF(OMPI_DEBUG_BUILD)
  ENDIF(BUILD_SHARED_LIBS)

@ -90,7 +90,7 @@ ENDIF(OMPI_WANT_CXX_BINDINGS)
 IF(OMPI_WANT_F77_BINDINGS)
  IF(BUILD_SHARED_LIBS)
    SET(OMPI_WRAPPER_EXTRA_FFLAGS 
-      "/TP /EHsc /D \"OMPI_IMPORTS\" /D \"OPAL_IMPORTS\" /D \"ORTE_IMPORTS\"")
+      "")
  ELSE(BUILD_SHARED_LIBS)
    IF(OMPI_DEBUG_BUILD)
      SET(OMPI_WRAPPER_EXTRA_FFLAGS "${F77_DYNAMIC_FLAG_DEBUG}")
--- a/ompi/tools/ompi-server/CMakeLists.txt
+++ b/ompi/tools/ompi-server/CMakeLists.txt
@ -16,7 +16,9 @@ ADD_EXECUTABLE (ompi-server ${OMPI_SERVER_SOURCE_FILES})

 IF(BUILD_SHARED_LIBS)
  SET_TARGET_PROPERTIES(ompi-server PROPERTIES
-    COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
+    COMPILE_FLAGS "${OMPI_C_DEF_PRE}_USRDLL ${OMPI_C_DEF_PRE}OPAL_IMPORTS
+                   ${OMPI_C_DEF_PRE}OMPI_IMPORTS ${OMPI_C_DEF_PRE}ORTE_IMPORTS
+                   ${OMPI_CXX_LAN_FLAG}")
 ENDIF(BUILD_SHARED_LIBS)

 TARGET_LINK_LIBRARIES (ompi-server libmpi libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
--- a/ompi/tools/ompi_info/CMakeLists.txt
+++ b/ompi/tools/ompi_info/CMakeLists.txt
@ -12,8 +12,10 @@ FILE(GLOB_RECURSE OMPI_INFO_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp")
 ADD_EXECUTABLE (ompi_info ${OMPI_INFO_SOURCE_FILES})

 IF(BUILD_SHARED_LIBS)
-  SET_TARGET_PROPERTIES(ompi_info PROPERTIES 
-    COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
+  SET_TARGET_PROPERTIES(ompi_info PROPERTIES
+     COMPILE_FLAGS "${OMPI_C_DEF_PRE}_USRDLL ${OMPI_C_DEF_PRE}OPAL_IMPORTS
+                    ${OMPI_C_DEF_PRE}OMPI_IMPORTS ${OMPI_C_DEF_PRE}ORTE_IMPORTS
+                    ${OMPI_CXX_LAN_FLAG}")
 ENDIF(BUILD_SHARED_LIBS)

 TARGET_LINK_LIBRARIES (ompi_info libmpi libopen-rte libopen-pal Ws2_32.lib shlwapi.lib)
--- a/opal/CMakeLists.txt
+++ b/opal/CMakeLists.txt
@ -105,7 +105,7 @@ ADD_LIBRARY (libopen-pal ${OPAL_SOURCE_FILES})

 # Set compile flags for this target
 IF (BUILD_SHARED_LIBS)
-  SET_TARGET_PROPERTIES(libopen-pal PROPERTIES COMPILE_FLAGS "-D_USRDLL -DOPAL_EXPORTS")
+  SET_TARGET_PROPERTIES(libopen-pal PROPERTIES COMPILE_FLAGS "${OMPI_C_DEF_PRE}_USRDLL ${OMPI_C_DEF_PRE}OPAL_EXPORTS")
  IF(OPAL_WANT_LIBLTDL AND LIBLTDL_FOUND)
    INCLUDE_DIRECTORIES(${LIBLTDL_INCLUDE_PATH})
    TARGET_LINK_LIBRARIES (libopen-pal Ws2_32.lib shlwapi.lib ${LIBLTDL_LIB})
@ -113,7 +113,7 @@ IF (BUILD_SHARED_LIBS)
    TARGET_LINK_LIBRARIES (libopen-pal Ws2_32.lib shlwapi.lib)
  ENDIF(OPAL_WANT_LIBLTDL AND LIBLTDL_FOUND)
 ELSE (BUILD_SHARED_LIBS)
-  SET_TARGET_PROPERTIES(libopen-pal PROPERTIES COMPILE_FLAGS "-D_LIB")
+  SET_TARGET_PROPERTIES(libopen-pal PROPERTIES COMPILE_FLAGS "${OMPI_C_DEF_PRE}_LIB")
 ENDIF(BUILD_SHARED_LIBS)

 # Generate install_dirs.h
--- a/opal/event/CMakeLists.txt
+++ b/opal/event/CMakeLists.txt
@ -20,7 +20,8 @@ ENDFOREACH (FILE)
 IF(WIN32)
  # include special path for these files
  SET_SOURCE_FILES_PROPERTIES(event/event.c event/log.c event/signal.c event/select.c event/evutil.c event/WIN32-Code/win32.c 
-    PROPERTIES COMPILE_FLAGS "/I \"${PROJECT_SOURCE_DIR}/event/compat\" /I \"${PROJECT_SOURCE_DIR}/event/WIN32-Code\"")
+    PROPERTIES COMPILE_FLAGS "${OMPI_C_INCLUDE_DIR}\"${PROJECT_SOURCE_DIR}/event/compat\"
+                              ${OMPI_C_INCLUDE_DIR}\"${PROJECT_SOURCE_DIR}/event/WIN32-Code\"")
  SET(EVENT_FILES
    ${EVENT_FILES}
    event-internal.h
--- a/opal/tools/opal-checkpoint/CMakeLists.txt
+++ b/opal/tools/opal-checkpoint/CMakeLists.txt
@ -13,7 +13,9 @@ ADD_EXECUTABLE (opal-checkpoint ${OPAL_CHECKPOINT_SOURCE_FILES})

 IF(BUILD_SHARED_LIBS)
  SET_TARGET_PROPERTIES(opal-checkpoint PROPERTIES 
-    COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
+    COMPILE_FLAGS "${OMPI_C_DEF_PRE}_USRDLL ${OMPI_C_DEF_PRE}OPAL_IMPORTS
+                   ${OMPI_C_DEF_PRE}OMPI_IMPORTS ${OMPI_C_DEF_PRE}ORTE_IMPORTS
+                   ${OMPI_CXX_LAN_FLAG}")
 ENDIF(BUILD_SHARED_LIBS)

 TARGET_LINK_LIBRARIES (opal-checkpoint libopen-pal Ws2_32.lib shlwapi.lib)
--- a/opal/tools/opal-restart/CMakeLists.txt
+++ b/opal/tools/opal-restart/CMakeLists.txt
@ -13,7 +13,9 @@ ADD_EXECUTABLE (opal-restart ${OPAL_RESTART_SOURCE_FILES})

 IF(BUILD_SHARED_LIBS)
  SET_TARGET_PROPERTIES(opal-restart PROPERTIES
-    COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
+    COMPILE_FLAGS "${OMPI_C_DEF_PRE}_USRDLL ${OMPI_C_DEF_PRE}OPAL_IMPORTS
+                   ${OMPI_C_DEF_PRE}OMPI_IMPORTS ${OMPI_C_DEF_PRE}ORTE_IMPORTS
+                   ${OMPI_CXX_LAN_FLAG}")
 ENDIF(BUILD_SHARED_LIBS)

 TARGET_LINK_LIBRARIES (opal-restart libopen-pal Ws2_32.lib shlwapi.lib)
--- a/opal/tools/wrappers/CMakeLists.txt
+++ b/opal/tools/wrappers/CMakeLists.txt
@ -15,7 +15,9 @@ TARGET_LINK_LIBRARIES (opal-wrapper libopen-pal Ws2_32.lib shlwapi.lib)

 IF(BUILD_SHARED_LIBS)
  SET_TARGET_PROPERTIES(opal-wrapper PROPERTIES
-    COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
+    COMPILE_FLAGS "${OMPI_C_DEF_PRE}_USRDLL ${OMPI_C_DEF_PRE}OPAL_IMPORTS
+                   ${OMPI_C_DEF_PRE}OMPI_IMPORTS ${OMPI_C_DEF_PRE}ORTE_IMPORTS
+                   ${OMPI_CXX_LAN_FLAG}")
 ENDIF(BUILD_SHARED_LIBS)

 ADD_CUSTOM_COMMAND (TARGET opal-wrapper
--- a/orte/CMakeLists.txt
+++ b/orte/CMakeLists.txt
@ -53,10 +53,10 @@ ADD_LIBRARY (libopen-rte ${ORTE_SOURCE_FILES})
 # Set compile flags for this target
 IF (BUILD_SHARED_LIBS)
  SET_TARGET_PROPERTIES(libopen-rte PROPERTIES
-    COMPILE_FLAGS "-D_USRDLL -DORTE_EXPORTS -DOPAL_IMPORTS /TP")
+    COMPILE_FLAGS "${OMPI_C_DEF_PRE}_USRDLL ${OMPI_C_DEF_PRE}ORTE_EXPORTS ${OMPI_C_DEF_PRE}OPAL_IMPORTS ${OMPI_CXX_LAN_FLAG}")
  TARGET_LINK_LIBRARIES (libopen-rte libopen-pal Ws2_32.lib shlwapi.lib)
 ELSE (BUILD_SHARED_LIBS)
-  SET_TARGET_PROPERTIES(libopen-rte PROPERTIES COMPILE_FLAGS "-D_LIB /TP")
+  SET_TARGET_PROPERTIES(libopen-rte PROPERTIES COMPILE_FLAGS "${OMPI_C_DEF_PRE}_LIB ${OMPI_CXX_LAN_FLAG}")
 ENDIF(BUILD_SHARED_LIBS)

 # generate orte_config.h
--- a/orte/tools/orte-checkpoint/CMakeLists.txt
+++ b/orte/tools/orte-checkpoint/CMakeLists.txt
@ -13,7 +13,9 @@ ADD_EXECUTABLE (orte-checkpoint ${ORTE_CHECKPOINT_SOURCE_FILES})

 IF(BUILD_SHARED_LIBS)
  SET_TARGET_PROPERTIES(orte-checkpoint PROPERTIES
-    COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
+    COMPILE_FLAGS "${OMPI_C_DEF_PRE}_USRDLL ${OMPI_C_DEF_PRE}OPAL_IMPORTS
+                   ${OMPI_C_DEF_PRE}OMPI_IMPORTS ${OMPI_C_DEF_PRE}ORTE_IMPORTS
+                   ${OMPI_CXX_LAN_FLAG}")
 ENDIF(BUILD_SHARED_LIBS)

 TARGET_LINK_LIBRARIES (orte-checkpoint libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
--- a/orte/tools/orte-clean/CMakeLists.txt
+++ b/orte/tools/orte-clean/CMakeLists.txt
@ -13,7 +13,9 @@ ADD_EXECUTABLE (orte-clean ${ORTE_CLEAN_SOURCE_FILES})

 IF(BUILD_SHARED_LIBS)
  SET_TARGET_PROPERTIES(orte-clean PROPERTIES 
-    COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
+    COMPILE_FLAGS "${OMPI_C_DEF_PRE}_USRDLL ${OMPI_C_DEF_PRE}OPAL_IMPORTS
+                   ${OMPI_C_DEF_PRE}OMPI_IMPORTS ${OMPI_C_DEF_PRE}ORTE_IMPORTS
+                   ${OMPI_CXX_LAN_FLAG}")
 ENDIF(BUILD_SHARED_LIBS)

 TARGET_LINK_LIBRARIES (orte-clean libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
--- a/orte/tools/orte-ps/CMakeLists.txt
+++ b/orte/tools/orte-ps/CMakeLists.txt
@ -13,7 +13,9 @@ ADD_EXECUTABLE (orte-ps ${ORTE_PS_SOURCE_FILES})

 IF(BUILD_SHARED_LIBS)
  SET_TARGET_PROPERTIES(orte-ps PROPERTIES
-    COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
+    COMPILE_FLAGS "${OMPI_C_DEF_PRE}_USRDLL ${OMPI_C_DEF_PRE}OPAL_IMPORTS
+                   ${OMPI_C_DEF_PRE}OMPI_IMPORTS ${OMPI_C_DEF_PRE}ORTE_IMPORTS
+                   ${OMPI_CXX_LAN_FLAG}")
 ENDIF(BUILD_SHARED_LIBS)

 TARGET_LINK_LIBRARIES (orte-ps libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
--- a/orte/tools/orte-restart/CMakeLists.txt
+++ b/orte/tools/orte-restart/CMakeLists.txt
@ -13,7 +13,9 @@ ADD_EXECUTABLE (orte-restart ${ORTE_RESTART_SOURCE_FILES})

 IF(BUILD_SHARED_LIBS)
  SET_TARGET_PROPERTIES(orte-restart PROPERTIES 
-    COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
+    COMPILE_FLAGS "${OMPI_C_DEF_PRE}_USRDLL ${OMPI_C_DEF_PRE}OPAL_IMPORTS
+                   ${OMPI_C_DEF_PRE}OMPI_IMPORTS ${OMPI_C_DEF_PRE}ORTE_IMPORTS
+                   ${OMPI_CXX_LAN_FLAG}")
 ENDIF(BUILD_SHARED_LIBS)

 TARGET_LINK_LIBRARIES (orte-restart libopen-pal libopen-rte)
--- a/orte/tools/orted/CMakeLists.txt
+++ b/orte/tools/orted/CMakeLists.txt
@ -13,7 +13,9 @@ ADD_EXECUTABLE (orted ${ORTED_SOURCE_FILES})

 IF(BUILD_SHARED_LIBS)
  SET_TARGET_PROPERTIES(orted PROPERTIES 
-    COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
+    COMPILE_FLAGS "${OMPI_C_DEF_PRE}_USRDLL ${OMPI_C_DEF_PRE}OPAL_IMPORTS
+                   ${OMPI_C_DEF_PRE}OMPI_IMPORTS ${OMPI_C_DEF_PRE}ORTE_IMPORTS
+                   ${OMPI_CXX_LAN_FLAG}")
 ENDIF(BUILD_SHARED_LIBS)

 TARGET_LINK_LIBRARIES (orted libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
--- a/orte/tools/orterun/CMakeLists.txt
+++ b/orte/tools/orterun/CMakeLists.txt
@ -13,7 +13,9 @@ ADD_EXECUTABLE (orterun ${ORTERUN_SOURCE_FILES})

 IF(BUILD_SHARED_LIBS)
  SET_TARGET_PROPERTIES(orterun PROPERTIES 
-    COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
+    COMPILE_FLAGS "${OMPI_C_DEF_PRE}_USRDLL ${OMPI_C_DEF_PRE}OPAL_IMPORTS
+                   ${OMPI_C_DEF_PRE}OMPI_IMPORTS ${OMPI_C_DEF_PRE}ORTE_IMPORTS
+                   ${OMPI_CXX_LAN_FLAG}")
 ENDIF(BUILD_SHARED_LIBS)

 TARGET_LINK_LIBRARIES (orterun libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)