From 2326f14be5e94ddd6c46eec2ff2c81949bfa9f49 Mon Sep 17 00:00:00 2001 From: Shiqing Fan Date: Wed, 25 Feb 2009 16:07:43 +0000 Subject: [PATCH] Remove the unnecessary PROJECT command, I somehow misunderstood how it should be used on Windows.... This commit was SVN r20634. --- contrib/platform/win32/CMakeModules/check_c_inline.cmake | 1 - contrib/platform/win32/CMakeModules/check_c_type_exists.cmake | 1 - contrib/platform/win32/CMakeModules/check_mca_subdirs.cmake | 1 - contrib/platform/win32/CMakeModules/check_sizeof_bool.cmake | 1 - .../win32/CMakeModules/f77_find_ext_symbol_convention.cmake | 1 - contrib/platform/win32/CMakeModules/ompi_check_Microsoft.cmake | 1 - ompi/mpi/cxx/CMakeLists.txt | 2 -- ompi/mpi/f77/CMakeLists.txt | 2 -- ompi/tools/ompi-server/CMakeLists.txt | 2 -- ompi/tools/ompi_info/CMakeLists.txt | 2 -- opal/tools/opal-checkpoint/CMakeLists.txt | 2 -- opal/tools/opal-restart/CMakeLists.txt | 2 -- opal/tools/wrappers/CMakeLists.txt | 2 -- orte/tools/orte-checkpoint/CMakeLists.txt | 2 -- orte/tools/orte-clean/CMakeLists.txt | 2 -- orte/tools/orte-ps/CMakeLists.txt | 2 -- orte/tools/orte-restart/CMakeLists.txt | 2 -- orte/tools/orted/CMakeLists.txt | 2 -- orte/tools/orterun/CMakeLists.txt | 2 -- test/mpi/environment/CMakeLists.txt | 2 -- 20 files changed, 34 deletions(-) diff --git a/contrib/platform/win32/CMakeModules/check_c_inline.cmake b/contrib/platform/win32/CMakeModules/check_c_inline.cmake index 7ecb3eed80..ae0b1e5637 100644 --- a/contrib/platform/win32/CMakeModules/check_c_inline.cmake +++ b/contrib/platform/win32/CMakeModules/check_c_inline.cmake @@ -16,7 +16,6 @@ MACRO(CHECK_C_INLINE) IF(NOT HAVE_INLINE) - PROJECT(FOO C) # path of foo test programs SET (FOO_SOURCE_DIR ${OpenMPI_SOURCE_DIR}/CMakeTests) diff --git a/contrib/platform/win32/CMakeModules/check_c_type_exists.cmake b/contrib/platform/win32/CMakeModules/check_c_type_exists.cmake index 79235eda7a..8abef6f2f2 100644 --- a/contrib/platform/win32/CMakeModules/check_c_type_exists.cmake +++ b/contrib/platform/win32/CMakeModules/check_c_type_exists.cmake @@ -23,7 +23,6 @@ MACRO(CHECK_C_TYPE_EXISTS TYPE TYPE_NAME INCLUDE_HEADERS) MESSAGE( STATUS "Checking for ${TYPE}...") - PROJECT(FOO) FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_${TYPE_NAME}.c" "${INCLUDE_HEADERS} int main(){ ${TYPE} test; return sizeof(${TYPE});}") diff --git a/contrib/platform/win32/CMakeModules/check_mca_subdirs.cmake b/contrib/platform/win32/CMakeModules/check_mca_subdirs.cmake index 4d9d1b7217..fd92de82ea 100644 --- a/contrib/platform/win32/CMakeModules/check_mca_subdirs.cmake +++ b/contrib/platform/win32/CMakeModules/check_mca_subdirs.cmake @@ -167,7 +167,6 @@ FOREACH (MCA_FRAMEWORK ${MCA_FRAMEWORK_LIST}) # # make new project for shared build -PROJECT(\"mca_${MCA_FRAMEWORK}_${MCA_COMPONENT}\") FILE(GLOB ${MCA_FRAMEWORK}_${MCA_COMPONENT}_FILES \"${CURRENT_PATH}/*.C\" diff --git a/contrib/platform/win32/CMakeModules/check_sizeof_bool.cmake b/contrib/platform/win32/CMakeModules/check_sizeof_bool.cmake index dbde2b04ba..c067a7f797 100644 --- a/contrib/platform/win32/CMakeModules/check_sizeof_bool.cmake +++ b/contrib/platform/win32/CMakeModules/check_sizeof_bool.cmake @@ -16,7 +16,6 @@ MACRO(CHECK_SIZEOF_BOOL) # # Try to compile and run a foo grogram, store the result in SIZEOF_BOOL. # - PROJECT(FOO) MESSAGE( STATUS "Checking size of bool...") FOREACH(LANG c cxx) diff --git a/contrib/platform/win32/CMakeModules/f77_find_ext_symbol_convention.cmake b/contrib/platform/win32/CMakeModules/f77_find_ext_symbol_convention.cmake index d4f87a5ed8..6d66293e40 100644 --- a/contrib/platform/win32/CMakeModules/f77_find_ext_symbol_convention.cmake +++ b/contrib/platform/win32/CMakeModules/f77_find_ext_symbol_convention.cmake @@ -104,7 +104,6 @@ MACRO(OMPI_F77_FIND_EXT_SYMBOL_CONVENTION) "int main(){${FUNC_NAME}();return(0);}") FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CMakeLists.txt - "PROJECT(conftest_c C)\n" "ADD_EXECUTABLE(conftest_c conftest_c.c)\n" "TARGET_LINK_LIBRARIES(conftest_c ${OUTPUT_OBJ_FILE})\n") diff --git a/contrib/platform/win32/CMakeModules/ompi_check_Microsoft.cmake b/contrib/platform/win32/CMakeModules/ompi_check_Microsoft.cmake index 933615f8b1..02454f1c14 100644 --- a/contrib/platform/win32/CMakeModules/ompi_check_Microsoft.cmake +++ b/contrib/platform/win32/CMakeModules/ompi_check_Microsoft.cmake @@ -84,7 +84,6 @@ MACRO(OMPI_MICROSOFT_COMPILER) # exported by kernel32.dll. If we force the usage of TRY_RUN # here we will check for both in same time: compilation and run. - PROJECT(FOO) # path of foo test programs SET (FOO_SOURCE_DIR ${OpenMPI_SOURCE_DIR}/CMakeTests) diff --git a/ompi/mpi/cxx/CMakeLists.txt b/ompi/mpi/cxx/CMakeLists.txt index 92fb0c6727..d70b551e57 100644 --- a/ompi/mpi/cxx/CMakeLists.txt +++ b/ompi/mpi/cxx/CMakeLists.txt @@ -7,8 +7,6 @@ # $HEADER$ # -PROJECT(MPI_CXX) - FILE(GLOB CXX_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp") # skip the file interface sources if not wanted diff --git a/ompi/mpi/f77/CMakeLists.txt b/ompi/mpi/f77/CMakeLists.txt index 0521da4a03..0f1593f355 100644 --- a/ompi/mpi/f77/CMakeLists.txt +++ b/ompi/mpi/f77/CMakeLists.txt @@ -7,8 +7,6 @@ # $HEADER$ # -PROJECT(MPI_F77) - FILE(GLOB OMPI_F77_FILES "*.c") FILE(GLOB OMPI_F77_HEADER_FILES "*.h") diff --git a/ompi/tools/ompi-server/CMakeLists.txt b/ompi/tools/ompi-server/CMakeLists.txt index 3b9674c521..d84fa5e220 100644 --- a/ompi/tools/ompi-server/CMakeLists.txt +++ b/ompi/tools/ompi-server/CMakeLists.txt @@ -10,8 +10,6 @@ # $HEADER$ # -PROJECT(OMPI_SERVER) - FILE(GLOB_RECURSE OMPI_SERVER_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp") ADD_EXECUTABLE (ompi-server ${OMPI_SERVER_SOURCE_FILES}) diff --git a/ompi/tools/ompi_info/CMakeLists.txt b/ompi/tools/ompi_info/CMakeLists.txt index 78a8fe7833..39cf2b1ac6 100644 --- a/ompi/tools/ompi_info/CMakeLists.txt +++ b/ompi/tools/ompi_info/CMakeLists.txt @@ -7,8 +7,6 @@ # $HEADER$ # -PROJECT(OMPI_INFO) - FILE(GLOB_RECURSE OMPI_INFO_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp") ADD_EXECUTABLE (ompi_info ${OMPI_INFO_SOURCE_FILES}) diff --git a/opal/tools/opal-checkpoint/CMakeLists.txt b/opal/tools/opal-checkpoint/CMakeLists.txt index b33f5501eb..c73301173b 100644 --- a/opal/tools/opal-checkpoint/CMakeLists.txt +++ b/opal/tools/opal-checkpoint/CMakeLists.txt @@ -7,8 +7,6 @@ # $HEADER$ # -PROJECT(OPAL_CHECKPOINT) - FILE(GLOB_RECURSE OPAL_CHECKPOINT_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp") ADD_EXECUTABLE (opal-checkpoint ${OPAL_CHECKPOINT_SOURCE_FILES}) diff --git a/opal/tools/opal-restart/CMakeLists.txt b/opal/tools/opal-restart/CMakeLists.txt index d26bbb1a13..4642630447 100644 --- a/opal/tools/opal-restart/CMakeLists.txt +++ b/opal/tools/opal-restart/CMakeLists.txt @@ -7,8 +7,6 @@ # $HEADER$ # -PROJECT(OPAL_RESTART) - FILE(GLOB_RECURSE OPAL_RESTART_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp") ADD_EXECUTABLE (opal-restart ${OPAL_RESTART_SOURCE_FILES}) diff --git a/opal/tools/wrappers/CMakeLists.txt b/opal/tools/wrappers/CMakeLists.txt index 06df485a3f..ea28fe0c54 100644 --- a/opal/tools/wrappers/CMakeLists.txt +++ b/opal/tools/wrappers/CMakeLists.txt @@ -7,8 +7,6 @@ # $HEADER$ # -PROJECT(OPAL_WRAPPER) - FILE(GLOB_RECURSE OPAL_WRAPPER_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp") ADD_EXECUTABLE (opal-wrapper ${OPAL_WRAPPER_SOURCE_FILES}) diff --git a/orte/tools/orte-checkpoint/CMakeLists.txt b/orte/tools/orte-checkpoint/CMakeLists.txt index eeb5b3281d..a760525006 100644 --- a/orte/tools/orte-checkpoint/CMakeLists.txt +++ b/orte/tools/orte-checkpoint/CMakeLists.txt @@ -7,8 +7,6 @@ # $HEADER$ # -PROJECT(ORTE_CHECKPOINT) - FILE(GLOB_RECURSE ORTE_CHECKPOINT_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp") ADD_EXECUTABLE (orte-checkpoint ${ORTE_CHECKPOINT_SOURCE_FILES}) diff --git a/orte/tools/orte-clean/CMakeLists.txt b/orte/tools/orte-clean/CMakeLists.txt index 54de53ffb3..dd470ac4ee 100644 --- a/orte/tools/orte-clean/CMakeLists.txt +++ b/orte/tools/orte-clean/CMakeLists.txt @@ -7,8 +7,6 @@ # $HEADER$ # -PROJECT(ORTE_CLEAN) - FILE(GLOB_RECURSE ORTE_CLEAN_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp") ADD_EXECUTABLE (orte-clean ${ORTE_CLEAN_SOURCE_FILES}) diff --git a/orte/tools/orte-ps/CMakeLists.txt b/orte/tools/orte-ps/CMakeLists.txt index b1289ab5f1..6bebf69c7e 100644 --- a/orte/tools/orte-ps/CMakeLists.txt +++ b/orte/tools/orte-ps/CMakeLists.txt @@ -7,8 +7,6 @@ # $HEADER$ # -PROJECT(ORTE_PS) - FILE(GLOB_RECURSE ORTE_PS_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp") ADD_EXECUTABLE (orte-ps ${ORTE_PS_SOURCE_FILES}) diff --git a/orte/tools/orte-restart/CMakeLists.txt b/orte/tools/orte-restart/CMakeLists.txt index 7e858ba783..08023ff7f5 100644 --- a/orte/tools/orte-restart/CMakeLists.txt +++ b/orte/tools/orte-restart/CMakeLists.txt @@ -7,8 +7,6 @@ # $HEADER$ # -PROJECT(ORTE_RESTART) - FILE(GLOB_RECURSE ORTE_RESTART_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp") ADD_EXECUTABLE (orte-restart ${ORTE_RESTART_SOURCE_FILES}) diff --git a/orte/tools/orted/CMakeLists.txt b/orte/tools/orted/CMakeLists.txt index 229aead739..1a4d59d1df 100644 --- a/orte/tools/orted/CMakeLists.txt +++ b/orte/tools/orted/CMakeLists.txt @@ -7,8 +7,6 @@ # $HEADER$ # -PROJECT(ORTED) - FILE(GLOB_RECURSE ORTED_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp") ADD_EXECUTABLE (orted ${ORTED_SOURCE_FILES}) diff --git a/orte/tools/orterun/CMakeLists.txt b/orte/tools/orterun/CMakeLists.txt index 5994a68868..6022625bfc 100644 --- a/orte/tools/orterun/CMakeLists.txt +++ b/orte/tools/orterun/CMakeLists.txt @@ -7,8 +7,6 @@ # $HEADER$ # -PROJECT(ORTERUN) - FILE(GLOB_RECURSE ORTERUN_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp") ADD_EXECUTABLE (orterun ${ORTERUN_SOURCE_FILES}) diff --git a/test/mpi/environment/CMakeLists.txt b/test/mpi/environment/CMakeLists.txt index 8b5cd668e5..9a0ea957bb 100644 --- a/test/mpi/environment/CMakeLists.txt +++ b/test/mpi/environment/CMakeLists.txt @@ -7,8 +7,6 @@ # $HEADER$ # - -PROJECT(CHELLO) SET(CHELLO_FILES chello.c )