Get rid of improper use of SET_SOURCE_FILES_PROPERTIES. When using the latest CMake (2.6 patch 4), we get many errors, which didn't show in previous version.

This commit was SVN r21188.
2009-05-07 17:41:05 +00:00 · 2009-05-07 17:41:05 +00:00 · 537b8cd8b1
--- a/ompi/CMakeLists.txt
+++ b/ompi/CMakeLists.txt
@ -140,10 +140,9 @@ SET_TARGET_PROPERTIES(libmpi PROPERTIES COMPILE_FLAGS

 # Set compile flags for this target
 IF (BUILD_SHARED_LIBS)
-  SET_SOURCE_FILES_PROPERTIES(${OMPI_SOURCE_FILES} PROPERTIES LANGUAGE CXX)
  ADD_DEPENDENCIES (libmpi libopen-pal libopen-rte)
-  SET_TARGET_PROPERTIES(libmpi PROPERTIES COMPILE_FLAGS "-D_USRDLL -DHAVE_CONFIG_H
-                        -DOMPI_EXPORTS")
+  SET_TARGET_PROPERTIES(libmpi PROPERTIES 
+    COMPILE_FLAGS "-D_USRDLL -DHAVE_CONFIG_H -DOMPI_EXPORTS /TP")
  TARGET_LINK_LIBRARIES (libmpi Ws2_32.lib shlwapi.lib)
 ELSE (BUILD_SHARED_LIBS)
  SET_TARGET_PROPERTIES(libmpi PROPERTIES COMPILE_FLAGS "-D_LIB")
--- a/ompi/tools/ompi-server/CMakeLists.txt
+++ b/ompi/tools/ompi-server/CMakeLists.txt
@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2007-2009 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
@ -15,8 +15,8 @@ FILE(GLOB_RECURSE OMPI_SERVER_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp")
 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")
-  SET_SOURCE_FILES_PROPERTIES(${OMPI_SERVER_SOURCE_FILES} PROPERTIES LANGUAGE CXX)
+  SET_TARGET_PROPERTIES(ompi-server PROPERTIES
+    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)
--- a/ompi/tools/ompi_info/CMakeLists.txt
+++ b/ompi/tools/ompi_info/CMakeLists.txt
@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
@ -15,8 +15,8 @@ ADD_DEFINITIONS(\"-DOMPI_CONFIGURE_DATE=\\\"${OMPI_CONFIGURE_DATE}\\\"\"
                \"-DOMPI_BUILD_DATE=\\\"${OMPI_BUILD_DATE}\\\"\")

 IF(BUILD_SHARED_LIBS)
-  SET_TARGET_PROPERTIES(ompi_info PROPERTIES COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS")
-  SET_SOURCE_FILES_PROPERTIES(${OMPI_INFO_SOURCE_FILES} PROPERTIES LANGUAGE CXX)
+  SET_TARGET_PROPERTIES(ompi_info PROPERTIES 
+    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)
--- a/opal/CMakeLists.txt
+++ b/opal/CMakeLists.txt
@ -8,10 +8,6 @@
 #


-
-# The source code is compiled as C++ for dynamic build 
-# and compiled as C for static build
-
 PROJECT (OPAL)


@ -101,14 +97,6 @@ ADD_LIBRARY (libopen-pal ${OPAL_SOURCE_FILES})

 # Set compile flags for this target
 IF (BUILD_SHARED_LIBS)
-  SET_SOURCE_FILES_PROPERTIES(${OPAL_SOURCE_FILES} 
-                              PROPERTIES LANGUAGE C)
-
-# Flex is trying to include the unistd.h file. As there is no configure
-# option on this, the flex generated files will try to include the file
-# even on platforms without unistd.h (such as Windows). Therefore, if we
-# know this file is not available, we can prevent flex from including it.
-# Thus, define "YY_NO_UNISTD_H" as the target property (the same for ORTE).
  SET_TARGET_PROPERTIES(libopen-pal PROPERTIES COMPILE_FLAGS "-D_USRDLL -DOPAL_EXPORTS")
  TARGET_LINK_LIBRARIES (libopen-pal Ws2_32.lib shlwapi.lib)
 ELSE (BUILD_SHARED_LIBS)
--- a/opal/tools/opal-checkpoint/CMakeLists.txt
+++ b/opal/tools/opal-checkpoint/CMakeLists.txt
@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
@ -12,8 +12,8 @@ FILE(GLOB_RECURSE OPAL_CHECKPOINT_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp")
 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")
-  SET_SOURCE_FILES_PROPERTIES(${OPAL_CHECKPOINT_SOURCE_FILES} PROPERTIES LANGUAGE CXX)
+  SET_TARGET_PROPERTIES(opal-checkpoint PROPERTIES 
+    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)
--- a/opal/tools/opal-restart/CMakeLists.txt
+++ b/opal/tools/opal-restart/CMakeLists.txt
@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
@ -12,8 +12,8 @@ FILE(GLOB_RECURSE OPAL_RESTART_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp")
 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")
-  SET_SOURCE_FILES_PROPERTIES(${OPAL_RESTART_SOURCE_FILES} PROPERTIES LANGUAGE CXX)
+  SET_TARGET_PROPERTIES(opal-restart PROPERTIES
+    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)
--- a/opal/tools/wrappers/CMakeLists.txt
+++ b/opal/tools/wrappers/CMakeLists.txt
@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
@ -14,8 +14,8 @@ ADD_EXECUTABLE (opal-wrapper ${OPAL_WRAPPER_SOURCE_FILES})
 TARGET_LINK_LIBRARIES (opal-wrapper 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")
-  SET_SOURCE_FILES_PROPERTIES(${OPAL_WRAPPER_SOURCE_FILES} PROPERTIES LANGUAGE CXX)
+  SET_TARGET_PROPERTIES(opal-wrapper PROPERTIES
+    COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
 ENDIF(BUILD_SHARED_LIBS)

 ADD_CUSTOM_COMMAND (TARGET opal-wrapper
--- a/orte/CMakeLists.txt
+++ b/orte/CMakeLists.txt
@ -8,10 +8,6 @@
 #


-
-# The source code is compiled as C++ for dynamic build 
-# and compiled as C for static build
-
 PROJECT (ORTE)


@ -61,7 +57,6 @@ ENDIF(EXISTS ${PROJECT_SOURCE_DIR}/util/hostfile/hostfile_lex.c)

 INCLUDE (check_mca_subdirs)
 SET (ORTE_SOURCE_FILES ${ORTE_SOURCE_FILES} ${MCA_FILES})
-SET_SOURCE_FILES_PROPERTIES(${ORTE_SOURCE_FILES} PROPERTIES LANGUAGE CXX)

 ADD_LIBRARY (libopen-rte ${ORTE_SOURCE_FILES})

@ -69,10 +64,11 @@ 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")
+  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)
 ELSE (BUILD_SHARED_LIBS)
-  SET_TARGET_PROPERTIES(libopen-rte PROPERTIES COMPILE_FLAGS "-D_LIB")
+  SET_TARGET_PROPERTIES(libopen-rte PROPERTIES COMPILE_FLAGS "-D_LIB /TP")
 ENDIF(BUILD_SHARED_LIBS)

 # generate orte_config.h
--- a/orte/tools/orte-checkpoint/CMakeLists.txt
+++ b/orte/tools/orte-checkpoint/CMakeLists.txt
@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
@ -12,8 +12,8 @@ FILE(GLOB_RECURSE ORTE_CHECKPOINT_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp")
 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")
-  SET_SOURCE_FILES_PROPERTIES(${ORTE_CHECKPOINT_SOURCE_FILES} PROPERTIES LANGUAGE CXX)
+  SET_TARGET_PROPERTIES(orte-checkpoint PROPERTIES
+    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)
--- a/orte/tools/orte-clean/CMakeLists.txt
+++ b/orte/tools/orte-clean/CMakeLists.txt
@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
@ -12,8 +12,8 @@ FILE(GLOB_RECURSE ORTE_CLEAN_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp")
 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")
-  SET_SOURCE_FILES_PROPERTIES(${ORTE_CLEAN_SOURCE_FILES} PROPERTIES LANGUAGE CXX)
+  SET_TARGET_PROPERTIES(orte-clean PROPERTIES 
+    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)
--- a/orte/tools/orte-ps/CMakeLists.txt
+++ b/orte/tools/orte-ps/CMakeLists.txt
@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
@ -12,8 +12,8 @@ FILE(GLOB_RECURSE ORTE_PS_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp")
 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")
-  SET_SOURCE_FILES_PROPERTIES(${ORTE_PS_SOURCE_FILES} PROPERTIES LANGUAGE CXX)
+  SET_TARGET_PROPERTIES(orte-ps PROPERTIES
+    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)
--- a/orte/tools/orte-restart/CMakeLists.txt
+++ b/orte/tools/orte-restart/CMakeLists.txt
@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
@ -12,8 +12,8 @@ FILE(GLOB_RECURSE ORTE_RESTART_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp")
 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")
-  SET_SOURCE_FILES_PROPERTIES(${ORTE_RESTART_SOURCE_FILES} PROPERTIES LANGUAGE CXX)
+  SET_TARGET_PROPERTIES(orte-restart PROPERTIES 
+    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)
--- a/orte/tools/orted/CMakeLists.txt
+++ b/orte/tools/orted/CMakeLists.txt
@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
@ -12,8 +12,8 @@ FILE(GLOB_RECURSE ORTED_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp")
 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")
-  SET_SOURCE_FILES_PROPERTIES(${ORTED_SOURCE_FILES} PROPERTIES LANGUAGE CXX)
+  SET_TARGET_PROPERTIES(orted PROPERTIES 
+    COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
 ENDIF(BUILD_SHARED_LIBS)

 TARGET_LINK_LIBRARIES (orted Ws2_32.lib shlwapi.lib)
--- a/orte/tools/orterun/CMakeLists.txt
+++ b/orte/tools/orterun/CMakeLists.txt
@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
@ -12,8 +12,8 @@ FILE(GLOB_RECURSE ORTERUN_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp")
 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")
-  SET_SOURCE_FILES_PROPERTIES(${ORTERUN_SOURCE_FILES} PROPERTIES LANGUAGE CXX)
+  SET_TARGET_PROPERTIES(orterun PROPERTIES 
+    COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
 ENDIF(BUILD_SHARED_LIBS)

 TARGET_LINK_LIBRARIES (orterun Ws2_32.lib shlwapi.lib)