ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Fix the bug that caused by ADD_DEPENDENCIES() from different version of CMake.

Просмотр исходного кода 
In CMake 2.6 and earlier, this function add dependencies for targets and also link the target libraries automatically, but in CMake 2.8,this behavior has been changed, i.e. it will only add the dependencies but no link, which will cause linking errors at compilation time.

This commit was SVN r22405.
Этот коммит содержится в:
Shiqing Fan 2010-01-14 18:10:20 +00:00
родитель cec840f6b9
Коммит 872a4047ba
55 изменённых файлов: 113 добавлений и 160 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

19
contrib/platform/win32/CMakeModules/check_mca_subdirs.cmake
Просмотреть файл

@ -1,5 +1,4 @@
#
# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart,
# Copyright (c) 2007-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -42,9 +41,7 @@ INCLUDE(list_subdirs)
# not_single_shared_lib: this component should not be built separately, it's not
# a single mca shared library.
#
# mca_dependencies: this component is dependent on other targets, e.g. libopen-pal
#
# mca_link_libraries: this component has to be linked with external libraries,
# mca_link_libraries: this component has to be linked with other targets or libraries,
# e.g. Ws2_32.lib
@ -199,13 +196,6 @@ FOREACH (MCA_FRAMEWORK ${MCA_FRAMEWORK_LIST})
ELSE(NOT OPAL_WANT_LIBLTDL OR NOT_SINGLE_SHARED_LIB STREQUAL "1")
# get the dependencies for this component.
SET(MCA_DEPENDENCIES "")
FILE(STRINGS ${CURRENT_PATH}/.windows VALUE REGEX "^mca_dependencies=")
IF(NOT VALUE STREQUAL "")
STRING(REPLACE "mca_dependencies=" "" MCA_DEPENDENCIES ${VALUE})
ENDIF(NOT VALUE STREQUAL "")
# get the libraries required for this component.
SET(MCA_LINK_LIBRARIES "")
@ -260,9 +250,8 @@ ADD_LIBRARY(${LIB_NAME_PREFIX}mca_${MCA_FRAMEWORK}_${MCA_COMPONENT} SHARED
SET_TARGET_PROPERTIES(${LIB_NAME_PREFIX}mca_${MCA_FRAMEWORK}_${MCA_COMPONENT}
PROPERTIES COMPILE_FLAGS \"-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP\")
TARGET_LINK_LIBRARIES (${LIB_NAME_PREFIX}mca_${MCA_FRAMEWORK}_${MCA_COMPONENT} ${MCA_LINK_LIBRARIES})
ADD_DEPENDENCIES(${LIB_NAME_PREFIX}mca_${MCA_FRAMEWORK}_${MCA_COMPONENT} libopen-pal ${MCA_DEPENDENCIES})
TARGET_LINK_LIBRARIES (${LIB_NAME_PREFIX}mca_${MCA_FRAMEWORK}_${MCA_COMPONENT}
libopen-pal ${MCA_LINK_LIBRARIES})
INSTALL(TARGETS ${LIB_NAME_PREFIX}mca_${MCA_FRAMEWORK}_${MCA_COMPONENT} ${INSTALL_DEST})
IF (OMPI_DEBUG_BUILD)

5
ompi/CMakeLists.txt
Просмотреть файл

@ -1,4 +1,4 @@
# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart,
# Copyright (c) 2007-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# Copyright (c) 2008 The University of Tennessee and The University
# of Tennessee Research Foundation. All rights
@ -123,10 +123,9 @@ SET_TARGET_PROPERTIES(libmpi PROPERTIES COMPILE_FLAGS
# Set compile flags for this target
IF (BUILD_SHARED_LIBS)
ADD_DEPENDENCIES (libmpi libopen-pal libopen-rte)
SET_TARGET_PROPERTIES(libmpi PROPERTIES
COMPILE_FLAGS "-D_USRDLL -DHAVE_CONFIG_H -DOMPI_EXPORTS /TP")
TARGET_LINK_LIBRARIES (libmpi Ws2_32.lib shlwapi.lib)
TARGET_LINK_LIBRARIES (libmpi libopen-rte)
ELSE (BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES(libmpi PROPERTIES COMPILE_FLAGS "-D_LIB")
ENDIF(BUILD_SHARED_LIBS)

4
ompi/mca/allocator/basic/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libmpi
mca_link_libraries=libmpi

4
ompi/mca/bml/r2/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libmpi libopen-rte
mca_link_libraries=libmpi

4
ompi/mca/btl/self/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libmpi
mca_link_libraries=libmpi

4
ompi/mca/btl/sm/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libmpi libopen-rte libmca_common_sm
mca_link_libraries=libmpi libmca_common_sm

5
ompi/mca/btl/tcp/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,5 +9,4 @@
#
# Specific to this module
mca_dependencies=libmpi libopen-rte
mca_link_libraries=Ws2_32.lib
mca_link_libraries=libmpi

4
ompi/mca/coll/basic/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libmpi
mca_link_libraries=libmpi

4
ompi/mca/coll/hierarch/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libmpi
mca_link_libraries=libmpi

4
ompi/mca/coll/self/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libmpi
mca_link_libraries=libmpi

4
ompi/mca/coll/sm/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libmpi libopen-rte libmca_common_sm
mca_link_libraries=libmpi libmca_common_sm

4
ompi/mca/coll/sync/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008-2009 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libmpi libopen-rte
mca_link_libraries=libmpi

4
ompi/mca/dpm/orte/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libmpi libopen-rte
mca_link_libraries=libmpi

4
ompi/mca/mpool/rdma/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libmpi libopen-rte
mca_link_libraries=libmpi

4
ompi/mca/mpool/sm/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libmpi libopen-rte libmca_common_sm
mca_link_libraries=libmpi libmca_common_sm

4
ompi/mca/osc/pt2pt/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libmpi
mca_link_libraries=libmpi

4
ompi/mca/osc/rdma/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libmpi
mca_link_libraries=libmpi

4
ompi/mca/pml/cm/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libmpi
mca_link_libraries=libmpi

4
ompi/mca/pml/ob1/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libmpi libopen-rte
mca_link_libraries=libmpi

4
ompi/mca/pubsub/orte/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libmpi libopen-rte
mca_link_libraries=libmpi

4
ompi/mpi/cxx/CMakeLists.txt
Просмотреть файл

@ -1,4 +1,4 @@
# Copyright (c) 2007-2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2007-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -28,7 +28,7 @@ SET_TARGET_PROPERTIES (libmpi_cxx PROPERTIES LINKER_LANGUAGE CXX)
# Set compile flags for this target
IF (BUILD_SHARED_LIBS)
ADD_DEPENDENCIES(libmpi_cxx libmpi libopen-pal)
TARGET_LINK_LIBRARIES(libmpi_cxx libmpi)
# 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

4
ompi/mpi/f77/CMakeLists.txt
Просмотреть файл

@ -1,4 +1,4 @@
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -55,7 +55,7 @@ ENDIF(OMPI_ENABLE_MPI_PROFILING)
ADD_LIBRARY(libmpi_f77 STATIC ${OMPI_F77_FILES} ${OMPI_F77_HEADER_FILES})
SET_TARGET_PROPERTIES(libmpi_f77 PROPERTIES LINKER_LANGUAGE CXX)
ADD_DEPENDENCIES(libmpi_f77 libmpi)
TARGET_LINK_LIBRARIES(libmpi_f77 libmpi)
INSTALL(TARGETS libmpi_f77
RUNTIME DESTINATION bin

7
ompi/tools/ompi-server/CMakeLists.txt
Просмотреть файл

@ -1,4 +1,4 @@
# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart,
# Copyright (c) 2007-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# Copyright (c) 2008 The University of Tennessee and The University
# of Tennessee Research Foundation. All rights
@ -19,11 +19,8 @@ IF(BUILD_SHARED_LIBS)
COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES (ompi-server Ws2_32.lib shlwapi.lib)
TARGET_LINK_LIBRARIES (ompi-server libmpi)
INSTALL(TARGETS ompi-server
DESTINATION bin)
INSTALL(FILES help-ompi-server.txt DESTINATION share/openmpi)
ADD_DEPENDENCIES (ompi-server libmpi libopen-pal libopen-rte )

7
ompi/tools/ompi_info/CMakeLists.txt
Просмотреть файл

@ -1,4 +1,4 @@
# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart,
# Copyright (c) 2007-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -19,10 +19,7 @@ IF(BUILD_SHARED_LIBS)
COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES (ompi_info Ws2_32.lib shlwapi.lib)
TARGET_LINK_LIBRARIES (ompi_info libmpi)
INSTALL(TARGETS ompi_info
DESTINATION bin)
INSTALL(FILES help-ompi_info.txt DESTINATION share/openmpi)
ADD_DEPENDENCIES (ompi_info libmpi libopen-rte libopen-pal)

6
opal/tools/opal-checkpoint/CMakeLists.txt
Просмотреть файл

@ -1,4 +1,4 @@
# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart,
# Copyright (c) 2007-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -16,10 +16,8 @@ IF(BUILD_SHARED_LIBS)
COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES (opal-checkpoint Ws2_32.lib shlwapi.lib)
TARGET_LINK_LIBRARIES (opal-checkpoint libopen-pal)
INSTALL(TARGETS opal-checkpoint
DESTINATION bin)
INSTALL(FILES help-opal-checkpoint.txt DESTINATION share/openmpi)
ADD_DEPENDENCIES (opal-checkpoint libopen-pal)

7
opal/tools/opal-restart/CMakeLists.txt
Просмотреть файл

@ -1,4 +1,4 @@
# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart,
# Copyright (c) 2007-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -16,11 +16,8 @@ IF(BUILD_SHARED_LIBS)
COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES (opal-restart Ws2_32.lib shlwapi.lib)
TARGET_LINK_LIBRARIES (opal-restart libopen-pal)
INSTALL(TARGETS opal-restart
DESTINATION bin)
INSTALL(FILES help-opal-restart.txt DESTINATION share/openmpi)
ADD_DEPENDENCIES (opal-restart libopen-pal)

6
opal/tools/wrappers/CMakeLists.txt
Просмотреть файл

@ -1,4 +1,4 @@
# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart,
# Copyright (c) 2007-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -11,7 +11,7 @@ FILE(GLOB_RECURSE OPAL_WRAPPER_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp")
ADD_EXECUTABLE (opal-wrapper ${OPAL_WRAPPER_SOURCE_FILES})
TARGET_LINK_LIBRARIES (opal-wrapper Ws2_32.lib shlwapi.lib)
TARGET_LINK_LIBRARIES (opal-wrapper libopen-pal)
IF(BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES(opal-wrapper PROPERTIES
@ -65,8 +65,6 @@ INSTALL(FILES ${PROJECT_BINARY_DIR}/mpicc.exe
${PROJECT_BINARY_DIR}/mpiexec.exe
DESTINATION bin)
ADD_DEPENDENCIES (opal-wrapper libopen-pal)
IF(WANT_INSTALL_HEADERS)
ADD_CUSTOM_COMMAND (TARGET opal-wrapper

5
orte/CMakeLists.txt
Просмотреть файл

@ -1,4 +1,4 @@
# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart,
# Copyright (c) 2007-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -55,13 +55,12 @@ SET (ORTE_SOURCE_FILES ${ORTE_SOURCE_FILES} ${MCA_FILES})
ADD_LIBRARY (libopen-rte ${ORTE_SOURCE_FILES})
ADD_DEPENDENCIES (libopen-rte libopen-pal)
# 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")
TARGET_LINK_LIBRARIES (libopen-rte Ws2_32.lib shlwapi.lib)
TARGET_LINK_LIBRARIES (libopen-rte libopen-pal)
ELSE (BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES(libopen-rte PROPERTIES COMPILE_FLAGS "-D_LIB /TP")
ENDIF(BUILD_SHARED_LIBS)

4
orte/mca/errmgr/default/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=libopen-rte

4
orte/mca/ess/env/.windows поставляемый
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=libopen-rte

4
orte/mca/ess/hnp/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=libopen-rte

4
orte/mca/ess/singleton/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=libopen-rte

4
orte/mca/grpcomm/basic/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=libopen-rte

5
orte/mca/iof/hnp/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,5 +9,4 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=Ws2_32.lib
mca_link_libraries=libopen-rte

5
orte/mca/iof/orted/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,5 +9,4 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=Ws2_32.lib
mca_link_libraries=libopen-rte

4
orte/mca/iof/tool/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=libopen-rte

4
orte/mca/odls/process/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=libopen-rte

5
orte/mca/oob/tcp/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,5 +9,4 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=Ws2_32.lib
mca_link_libraries=libopen-rte

4
orte/mca/plm/ccp/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2009 High Performance Computing Center Stuttgart,
# Copyright (c) 2009-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,5 +9,5 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=libopen-rte
required_check=find_ccp

4
orte/mca/plm/process/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=libopen-rte

4
orte/mca/ras/ccp/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2009 High Performance Computing Center Stuttgart,
# Copyright (c) 2009-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,5 +9,5 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=libopen-rte
required_check=find_ccp

4
orte/mca/rmaps/round_robin/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=libopen-rte

4
orte/mca/rmaps/seq/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=libopen-rte

4
orte/mca/rmaps/topo/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=libopen-rte

4
orte/mca/rml/ftrm/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=libopen-rte

5
orte/mca/rml/oob/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,5 +9,4 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=Ws2_32.lib
mca_link_libraries=libopen-rte

4
orte/mca/routed/binomial/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=libopen-rte

4
orte/mca/routed/linear/.windows
Просмотреть файл

@ -1,5 +1,5 @@
#
# Copyright (c) 2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -9,4 +9,4 @@
#
# Specific to this module
mca_dependencies=libopen-rte
mca_link_libraries=libopen-rte

6
orte/tools/orte-checkpoint/CMakeLists.txt
Просмотреть файл

@ -1,4 +1,4 @@
# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart,
# Copyright (c) 2007-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -16,9 +16,7 @@ IF(BUILD_SHARED_LIBS)
COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES (orte-checkpoint Ws2_32.lib shlwapi.lib)
ADD_DEPENDENCIES (orte-checkpoint libopen-pal libopen-rte)
TARGET_LINK_LIBRARIES (orte-checkpoint libopen-rte)
ADD_CUSTOM_COMMAND (TARGET orte-checkpoint
POST_BUILD

8
orte/tools/orte-clean/CMakeLists.txt
Просмотреть файл

@ -1,4 +1,4 @@
# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart,
# Copyright (c) 2007-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -16,9 +16,7 @@ IF(BUILD_SHARED_LIBS)
COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES (orte-clean Ws2_32.lib shlwapi.lib)
ADD_DEPENDENCIES (orte-clean libopen-pal libopen-rte)
TARGET_LINK_LIBRARIES (orte-clean libopen-rte)
ADD_CUSTOM_COMMAND (TARGET orte-clean
POST_BUILD
@ -26,7 +24,7 @@ ADD_CUSTOM_COMMAND (TARGET orte-clean
${OpenMPI_BINARY_DIR}/${CMAKE_CFG_INTDIR}/orte-clean.exe
${PROJECT_BINARY_DIR}/ompi-clean.exe
COMMENT "Copying renamed executables...")
INSTALL(TARGETS orte-clean
DESTINATION bin)
INSTALL(FILES help-orte-clean.txt DESTINATION share/openmpi)

6
orte/tools/orte-ps/CMakeLists.txt
Просмотреть файл

@ -1,4 +1,4 @@
# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart,
# Copyright (c) 2007-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -16,7 +16,7 @@ IF(BUILD_SHARED_LIBS)
COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES (orte-ps Ws2_32.lib shlwapi.lib)
TARGET_LINK_LIBRARIES (orte-ps libopen-rte)
ADD_CUSTOM_COMMAND (TARGET orte-ps
POST_BUILD
@ -30,5 +30,3 @@ INSTALL(TARGETS orte-ps
INSTALL(FILES help-orte-ps.txt DESTINATION share/openmpi)
INSTALL(FILES ${PROJECT_BINARY_DIR}/ompi-ps.exe
DESTINATION bin)
ADD_DEPENDENCIES (orte-ps libopen-pal libopen-rte)

6
orte/tools/orte-restart/CMakeLists.txt
Просмотреть файл

@ -1,4 +1,4 @@
# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart,
# Copyright (c) 2007-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -16,6 +16,4 @@ IF(BUILD_SHARED_LIBS)
COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES (orte-restart Ws2_32.lib shlwapi.lib)
ADD_DEPENDENCIES (orte-restart libopen-pal libopen-rte)
TARGET_LINK_LIBRARIES (orte-restart libopen-rte)

7
orte/tools/orted/CMakeLists.txt
Просмотреть файл

@ -1,4 +1,4 @@
# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart,
# Copyright (c) 2007-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -16,10 +16,7 @@ IF(BUILD_SHARED_LIBS)
COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES (orted Ws2_32.lib shlwapi.lib)
TARGET_LINK_LIBRARIES (orted libopen-rte)
INSTALL(TARGETS orted
DESTINATION bin)
ADD_DEPENDENCIES (orted libopen-pal libopen-rte)

6
orte/tools/orterun/CMakeLists.txt
Просмотреть файл

@ -1,4 +1,4 @@
# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart,
# Copyright (c) 2007-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -16,9 +16,7 @@ IF(BUILD_SHARED_LIBS)
COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES (orterun Ws2_32.lib shlwapi.lib)
ADD_DEPENDENCIES (orterun libopen-pal libopen-rte)
TARGET_LINK_LIBRARIES (orterun libopen-rte)
ADD_CUSTOM_COMMAND (TARGET orterun
POST_BUILD

7
test/mpi/environment/CMakeLists.txt
Просмотреть файл

@ -1,4 +1,4 @@
# Copyright (c) 2007-2008 High Performance Computing Center Stuttgart,
# Copyright (c) 2007-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# $COPYRIGHT$
#
@ -13,7 +13,4 @@ SET(CHELLO_FILES
ADD_EXECUTABLE (chello ${CHELLO_FILES})
TARGET_LINK_LIBRARIES (chello Ws2_32.lib shlwapi.lib)
ADD_DEPENDENCIES (chello libopen-pal libopen-rte libmpi)
TARGET_LINK_LIBRARIES (chello libmpi)