A more clean way to build on Windows.

It's not possible to combine two shared libraries on Windows, so we have to do it a bit different. First generate a small event static library by just linking the object files, and link it into other libraries that needs the libevent API. This commit was SVN r24039.
2010-11-11 12:02:54 +00:00 · 2010-11-11 12:02:54 +00:00 · c03ea1a5f3
--- a/contrib/platform/win32/CMakeModules/opal_event_config.cmake
+++ b/contrib/platform/win32/CMakeModules/opal_event_config.cmake
@ -78,6 +78,31 @@ ELSE(IN_USE STREQUAL "0")
      OMPI_DEF(MCA_event_IMPLEMENTATION_HEADER "${CURRENT_PATH}/libevent207.h"
        "Header to include for event implementation" 1 1)

+      # for generating the static library, as opal will not export event API any more.
+      SET(EVENT_OBJ_FILES
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/win32select.obj
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/evthread_win32.obj
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/buffer_iocp.obj
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/event_iocp.obj
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/bufferevent_async.obj
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/event.obj
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/evthread.obj
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/buffer.obj
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/bufferevent.obj
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/bufferevent_sock.obj
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/bufferevent_filter.obj
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/bufferevent_pair.obj
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/listener.obj
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/bufferevent_ratelim.obj
+	    ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/evmap.obj
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/log.obj
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/evutil.obj
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/evutil_rand.obj
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/strlcpy.obj
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/signal.obj
+        ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}/event_tagging.obj
+      )
+
    ELSE(WIN32)
      SET(RESULT_SOURCE_FILES
        ${RESULT_SOURCE_FILES}
--- a/ompi/CMakeLists.txt
+++ b/ompi/CMakeLists.txt
@ -131,11 +131,9 @@ SET_TARGET_PROPERTIES(libmpi PROPERTIES COMPILE_FLAGS
 IF (BUILD_SHARED_LIBS)
  SET_TARGET_PROPERTIES(libmpi PROPERTIES 
    COMPILE_FLAGS "${OMPI_C_DEF_PRE}_USRDLL ${OMPI_C_DEF_PRE}HAVE_CONFIG_H
-                   ${OMPI_C_DEF_PRE}OMPI_EXPORTS ${OMPI_C_DEF_PRE}ORTE_IMPORTS ${OMPI_CXX_LAN_FLAG}")
-  TARGET_LINK_LIBRARIES (libmpi 
-    ${OpenMPI_BINARY_DIR}/libopen-rte-lt${CMAKE_DEBUG_POSTFIX}.lib
-    ${OpenMPI_BINARY_DIR}/libopen-pal-lt${CMAKE_DEBUG_POSTFIX}.lib
-    Ws2_32.lib shlwapi.lib ${EXTRA_LINK_LIBRARIES})
+                   ${OMPI_C_DEF_PRE}OMPI_EXPORTS ${OMPI_C_DEF_PRE}OPAL_IMPORTS ${OMPI_C_DEF_PRE}ORTE_IMPORTS ${OMPI_CXX_LAN_FLAG}")
+  TARGET_LINK_LIBRARIES (libmpi ${OpenMPI_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event${CMAKE_DEBUG_POSTFIX}.lib
+    libopen-rte Ws2_32.lib shlwapi.lib ${EXTRA_LINK_LIBRARIES}) 
 ELSE (BUILD_SHARED_LIBS)
  SET_TARGET_PROPERTIES(libmpi PROPERTIES COMPILE_FLAGS "${OMPI_C_DEF_PRE}_LIB")
 ENDIF(BUILD_SHARED_LIBS)
--- a/ompi/mpi/cxx/CMakeLists.txt
+++ b/ompi/mpi/cxx/CMakeLists.txt
@ -28,7 +28,7 @@ SET_TARGET_PROPERTIES (libmpi_cxx PROPERTIES LINKER_LANGUAGE CXX)
 # Set compile flags for this target
 IF (BUILD_SHARED_LIBS)

-  TARGET_LINK_LIBRARIES(libmpi_cxx ${OpenMPI_BINARY_DIR}/libopen-pal-lt${CMAKE_DEBUG_POSTFIX}.lib libmpi)
+  TARGET_LINK_LIBRARIES(libmpi_cxx libmpi libopen-pal)
  # Need OMPI_BUILDING_CXX_BINDINGS_LIBRARY so that we can get the path 
  # names correct inside the MPI C++ library.  OMPI_SKIP_MPICXX is necessary
  # so that mpi.h doesn't include mpicxx.h through the incorrect pathname 
--- a/ompi/tools/ompi-server/CMakeLists.txt
+++ b/ompi/tools/ompi-server/CMakeLists.txt
@ -16,16 +16,13 @@ ADD_EXECUTABLE (ompi-server ${OMPI_SERVER_SOURCE_FILES})

 ADD_DEPENDENCIES(ompi-server libmpi)
 IF(BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES (ompi-server ${OpenMPI_BINARY_DIR}/libopen-pal-lt${CMAKE_DEBUG_POSTFIX}.lib
-    libopen-rte libmpi Ws2_32.lib shlwapi.lib)
  SET_TARGET_PROPERTIES(ompi-server 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}")
-ELSE(BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES (ompi-server libmpi libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
 ENDIF(BUILD_SHARED_LIBS)

+TARGET_LINK_LIBRARIES (ompi-server libmpi libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)

 INSTALL(TARGETS ompi-server
  DESTINATION bin)
--- a/ompi/tools/ompi_info/CMakeLists.txt
+++ b/ompi/tools/ompi_info/CMakeLists.txt
@ -13,17 +13,13 @@ ADD_EXECUTABLE (ompi_info ${OMPI_INFO_SOURCE_FILES})

 ADD_DEPENDENCIES(ompi_info libmpi)
 IF(BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES (ompi_info ${OpenMPI_BINARY_DIR}/libopen-pal-lt${CMAKE_DEBUG_POSTFIX}.lib
-    ${OpenMPI_BINARY_DIR}/libopen-rte-lt${CMAKE_DEBUG_POSTFIX}.lib
-    libmpi Ws2_32.lib shlwapi.lib)
  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}")
-ELSE(BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES (ompi_info libmpi libopen-rte libopen-pal Ws2_32.lib shlwapi.lib)
 ENDIF(BUILD_SHARED_LIBS)

+TARGET_LINK_LIBRARIES (ompi_info libmpi libopen-rte libopen-pal Ws2_32.lib shlwapi.lib)

 INSTALL(TARGETS ompi_info
  DESTINATION bin)
--- a/opal/CMakeLists.txt
+++ b/opal/CMakeLists.txt
@ -92,9 +92,9 @@ ADD_LIBRARY (libopen-pal ${OPAL_SOURCE_FILES})
 # Set compile flags for this target
 IF (BUILD_SHARED_LIBS)
  ADD_CUSTOM_COMMAND(TARGET libopen-pal POST_BUILD
-    COMMAND ${OMPI_LIB_CMD} *.obj ${OMPI_LIB_CMD_OUTPUT}${OpenMPI_BINARY_DIR}/libopen-pal-lt${CMAKE_DEBUG_POSTFIX}.lib
-    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/libopen-pal.dir/${CMAKE_CFG_INTDIR}
-    COMMENT "Generating static library."
+    COMMAND ${OMPI_LIB_CMD} ${EVENT_OBJ_FILES} ${OMPI_LIB_CMD_OUTPUT}${OpenMPI_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event${CMAKE_DEBUG_POSTFIX}.lib
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+    COMMENT "Generating static event library."
  )

  SET_TARGET_PROPERTIES(libopen-pal PROPERTIES COMPILE_FLAGS "${OMPI_C_DEF_PRE}_USRDLL ${OMPI_C_DEF_PRE}OPAL_EXPORTS")
--- a/opal/tools/opal-checkpoint/CMakeLists.txt
+++ b/opal/tools/opal-checkpoint/CMakeLists.txt
@ -13,16 +13,13 @@ ADD_EXECUTABLE (opal-checkpoint ${OPAL_CHECKPOINT_SOURCE_FILES})

 ADD_DEPENDENCIES(opal-checkpoint libopen-pal)
 IF(BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES (opal-checkpoint Ws2_32.lib shlwapi.lib
-    ${OpenMPI_BINARY_DIR}/libopen-pal-lt${CMAKE_DEBUG_POSTFIX}.lib)
  SET_TARGET_PROPERTIES(opal-checkpoint 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}")
-ELSE(BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES (opal-checkpoint libopen-pal Ws2_32.lib shlwapi.lib)
 ENDIF(BUILD_SHARED_LIBS)

+TARGET_LINK_LIBRARIES (opal-checkpoint libopen-pal Ws2_32.lib shlwapi.lib)

 INSTALL(TARGETS opal-checkpoint
  DESTINATION bin)
--- a/opal/tools/opal-restart/CMakeLists.txt
+++ b/opal/tools/opal-restart/CMakeLists.txt
@ -13,16 +13,14 @@ ADD_EXECUTABLE (opal-restart ${OPAL_RESTART_SOURCE_FILES})

 ADD_DEPENDENCIES(opal-restart libopen-pal)
 IF(BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES (opal-restart Ws2_32.lib shlwapi.lib
-    ${OpenMPI_BINARY_DIR}/libopen-pal-lt${CMAKE_DEBUG_POSTFIX}.lib)
  SET_TARGET_PROPERTIES(opal-restart 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}")
-ELSE(BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES (opal-restart libopen-pal Ws2_32.lib shlwapi.lib)
 ENDIF(BUILD_SHARED_LIBS)

+TARGET_LINK_LIBRARIES (opal-restart libopen-pal Ws2_32.lib shlwapi.lib)
+
 INSTALL(TARGETS opal-restart
  DESTINATION bin)
 INSTALL(FILES help-opal-restart.txt DESTINATION share/openmpi)
--- a/opal/tools/wrappers/CMakeLists.txt
+++ b/opal/tools/wrappers/CMakeLists.txt
@ -13,16 +13,14 @@ ADD_EXECUTABLE (opal-wrapper ${OPAL_WRAPPER_SOURCE_FILES})

 ADD_DEPENDENCIES(opal-wrapper libopen-pal)
 IF(BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES (opal-wrapper Ws2_32.lib shlwapi.lib
-    ${OpenMPI_BINARY_DIR}/libopen-pal-lt${CMAKE_DEBUG_POSTFIX}.lib)
  SET_TARGET_PROPERTIES(opal-wrapper 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}")
-ELSE(BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES (opal-wrapper libopen-pal Ws2_32.lib shlwapi.lib)
 ENDIF(BUILD_SHARED_LIBS)

+  TARGET_LINK_LIBRARIES (opal-wrapper libopen-pal Ws2_32.lib shlwapi.lib)
+
 ADD_CUSTOM_COMMAND (TARGET opal-wrapper
  POST_BUILD
  COMMAND ${CMAKE_COMMAND} -E copy
--- a/orte/CMakeLists.txt
+++ b/orte/CMakeLists.txt
@ -55,15 +55,10 @@ ADD_DEPENDENCIES(libopen-rte libopen-pal)

 # Set compile flags for this target
 IF (BUILD_SHARED_LIBS)
-  ADD_CUSTOM_COMMAND(TARGET libopen-rte POST_BUILD
-    COMMAND ${OMPI_LIB_CMD} *.obj ${OMPI_LIB_CMD_OUTPUT}${OpenMPI_BINARY_DIR}/libopen-rte-lt${CMAKE_DEBUG_POSTFIX}.lib
-    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/libopen-rte.dir/${CMAKE_CFG_INTDIR}
-    COMMENT "Generating static library."
-  )
-
  SET_TARGET_PROPERTIES(libopen-rte PROPERTIES
-    COMPILE_FLAGS "${OMPI_C_DEF_PRE}_USRDLL ${OMPI_C_DEF_PRE}ORTE_EXPORTS ${OMPI_CXX_LAN_FLAG}")
-  TARGET_LINK_LIBRARIES (libopen-rte ${OpenMPI_BINARY_DIR}/libopen-pal-lt${CMAKE_DEBUG_POSTFIX}.lib Ws2_32.lib shlwapi.lib)
+    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 ${OpenMPI_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event${CMAKE_DEBUG_POSTFIX}.lib
+    libopen-pal Ws2_32.lib shlwapi.lib) 
 ELSE (BUILD_SHARED_LIBS)
  SET_TARGET_PROPERTIES(libopen-rte PROPERTIES COMPILE_FLAGS "${OMPI_C_DEF_PRE}_LIB ${OMPI_CXX_LAN_FLAG}")
 ENDIF(BUILD_SHARED_LIBS)
--- a/orte/tools/orte-checkpoint/CMakeLists.txt
+++ b/orte/tools/orte-checkpoint/CMakeLists.txt
@ -13,17 +13,14 @@ ADD_EXECUTABLE (orte-checkpoint ${ORTE_CHECKPOINT_SOURCE_FILES})

 ADD_DEPENDENCIES(orte-checkpoint libopen-rte libopen-pal)
 IF(BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES (orte-checkpoint Ws2_32.lib shlwapi.lib
-    ${OpenMPI_BINARY_DIR}/libopen-pal-lt${CMAKE_DEBUG_POSTFIX}.lib
-    libopen-rte)
  SET_TARGET_PROPERTIES(orte-checkpoint 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}")
-ELSE(BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES (orte-checkpoint libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
 ENDIF(BUILD_SHARED_LIBS)

+TARGET_LINK_LIBRARIES (orte-checkpoint libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
+
 ADD_CUSTOM_COMMAND (TARGET orte-checkpoint
  POST_BUILD
  COMMAND ${CMAKE_COMMAND} -E copy
--- a/orte/tools/orte-clean/CMakeLists.txt
+++ b/orte/tools/orte-clean/CMakeLists.txt
@ -13,17 +13,14 @@ ADD_EXECUTABLE (orte-clean ${ORTE_CLEAN_SOURCE_FILES})

 ADD_DEPENDENCIES(orte-clean libopen-rte libopen-pal)
 IF(BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES (orte-clean Ws2_32.lib shlwapi.lib
-    ${OpenMPI_BINARY_DIR}/libopen-pal-lt${CMAKE_DEBUG_POSTFIX}.lib
-    libopen-rte)
  SET_TARGET_PROPERTIES(orte-clean 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}")
-ELSE(BUILD_SHARED_LIBS)
-TARGET_LINK_LIBRARIES (orte-clean libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
 ENDIF(BUILD_SHARED_LIBS)

+TARGET_LINK_LIBRARIES (orte-clean libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
+
 ADD_CUSTOM_COMMAND (TARGET orte-clean
  POST_BUILD
  COMMAND ${CMAKE_COMMAND} -E copy
--- a/orte/tools/orte-ps/CMakeLists.txt
+++ b/orte/tools/orte-ps/CMakeLists.txt
@ -13,17 +13,14 @@ ADD_EXECUTABLE (orte-ps ${ORTE_PS_SOURCE_FILES})

 ADD_DEPENDENCIES(orte-ps libopen-rte libopen-pal)
 IF(BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES(orte-ps Ws2_32.lib shlwapi.lib
-    ${OpenMPI_BINARY_DIR}/libopen-pal-lt${CMAKE_DEBUG_POSTFIX}.lib
-    libopen-rte)
  SET_TARGET_PROPERTIES(orte-ps 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}")
-ELSE(BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES (orte-ps libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
 ENDIF(BUILD_SHARED_LIBS)

+TARGET_LINK_LIBRARIES (orte-ps libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
+
 ADD_CUSTOM_COMMAND (TARGET orte-ps
  POST_BUILD
  COMMAND ${CMAKE_COMMAND} -E copy
--- a/orte/tools/orted/CMakeLists.txt
+++ b/orte/tools/orted/CMakeLists.txt
@ -13,16 +13,13 @@ ADD_EXECUTABLE (orted ${ORTED_SOURCE_FILES})

 ADD_DEPENDENCIES(orted libopen-rte libopen-pal)
 IF(BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES (orted Ws2_32.lib shlwapi.lib
-    ${OpenMPI_BINARY_DIR}/libopen-pal-lt${CMAKE_DEBUG_POSTFIX}.lib
-    libopen-rte)
  SET_TARGET_PROPERTIES(orted 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}")
-ELSE(BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES (orted libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
 ENDIF(BUILD_SHARED_LIBS)

+TARGET_LINK_LIBRARIES (orted libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
+
 INSTALL(TARGETS orted
  DESTINATION bin)
--- a/orte/tools/orterun/CMakeLists.txt
+++ b/orte/tools/orterun/CMakeLists.txt
@ -13,17 +13,14 @@ ADD_EXECUTABLE (orterun ${ORTERUN_SOURCE_FILES})

 ADD_DEPENDENCIES(orterun libopen-rte libopen-pal)
 IF(BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES (orterun Ws2_32.lib shlwapi.lib
-    ${OpenMPI_BINARY_DIR}/libopen-pal-lt${CMAKE_DEBUG_POSTFIX}.lib
-    libopen-rte)
  SET_TARGET_PROPERTIES(orterun 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}")
-ELSE(BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES (orterun libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
 ENDIF(BUILD_SHARED_LIBS)

+TARGET_LINK_LIBRARIES (orterun libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
+
 ADD_CUSTOM_COMMAND (TARGET orterun
  POST_BUILD
  COMMAND ${CMAKE_COMMAND} -E copy