Use exclude lists for non-ordinary sub directories check.

This commit was SVN r23631.

ompi/CMakeLists.txt

@@ -22,12 +22,14 @@ PROJECT (OMPI)
 INCLUDE(list_subdirs)
 CHECK_SUBDIRS("${PROJECT_SOURCE_DIR}" OMPI_SUBDIRS)
 
+SET(OMPI_EXCLUDE_SUBDIRS contrib debuggers mca mpi mpiext tools)
 
 FOREACH(OMPI_SUBDIR ${OMPI_SUBDIRS})
 
-  IF(NOT ${OMPI_SUBDIR} STREQUAL "mca" AND NOT ${OMPI_SUBDIR} STREQUAL "mpi" AND NOT ${OMPI_SUBDIR} STREQUAL "contrib" 
+  LIST(FIND OMPI_EXCLUDE_SUBDIRS ${OMPI_SUBDIR} OMPI_EXCLUDE_SUBDIR)
-    AND NOT ${OMPI_SUBDIR} STREQUAL "debuggers" AND NOT ${OMPI_SUBDIR} STREQUAL "tools")
+
-      
+  IF(${OMPI_EXCLUDE_SUBDIR} EQUAL -1)
+
       FILE(GLOB_RECURSE OMPI_${OMPI_SUBDIR}_FILES 
         "${OMPI_SUBDIR}/*.h" "${OMPI_SUBDIR}/*.c" "${OMPI_SUBDIR}/*.cc" "${OMPI_SUBDIR}/*.cpp")
         
@@ -38,9 +40,8 @@ FOREACH(OMPI_SUBDIR ${OMPI_SUBDIRS})
       
       SOURCE_GROUP("${OMPI_SUBDIR}" FILES ${OMPI_${OMPI_SUBDIR}_FILES})
       
-  ENDIF(NOT ${OMPI_SUBDIR} STREQUAL "mca" AND NOT ${OMPI_SUBDIR} STREQUAL "mpi" AND NOT ${OMPI_SUBDIR} STREQUAL "contrib" 
+  ENDIF(${OMPI_EXCLUDE_SUBDIR} EQUAL  -1)
-    AND NOT ${OMPI_SUBDIR} STREQUAL "debuggers" AND NOT ${OMPI_SUBDIR} STREQUAL "tools")
+  
-
 ENDFOREACH(OMPI_SUBDIR ${OMPI_SUBDIRS})
 
 # Special care should be taken for the debugger directory

opal/CMakeLists.txt

@@ -56,20 +56,16 @@ SET (OPAL_SOURCE_FILES
 INCLUDE(list_subdirs)
 CHECK_SUBDIRS("${PROJECT_SOURCE_DIR}" OPAL_SUBDIRS)
 
+SET(OPAL_EXCLUDE_SUBDIRS event include libltdl mca tools)
 
 FOREACH(OPAL_SUBDIR ${OPAL_SUBDIRS})
 
-  IF(NOT ${OPAL_SUBDIR} STREQUAL "mca" AND NOT ${OPAL_SUBDIR} STREQUAL "event" 
+  LIST(FIND OPAL_EXCLUDE_SUBDIRS ${OPAL_SUBDIR} OPAL_EXCLUDE_SUBDIR)
-    AND NOT ${OPAL_SUBDIR} STREQUAL "libltdl" AND NOT ${OPAL_SUBDIR} STREQUAL "include" 
+
-    AND NOT ${OPAL_SUBDIR} STREQUAL "tools")
+  IF(${OPAL_EXCLUDE_SUBDIR} EQUAL -1)
       
-      IF(NOT ${OPAL_SUBDIR} STREQUAL "win32")
+    FILE(GLOB_RECURSE OPAL_${OPAL_SUBDIR}_FILES 
-        FILE(GLOB_RECURSE OPAL_${OPAL_SUBDIR}_FILES 
+      "${OPAL_SUBDIR}/*.h" "${OPAL_SUBDIR}/*.c" "${OPAL_SUBDIR}/*.cc" "${OPAL_SUBDIR}/*.cpp")
-          "${OPAL_SUBDIR}/*.h" "${OPAL_SUBDIR}/*.c" "${OPAL_SUBDIR}/*.cc" "${OPAL_SUBDIR}/*.cpp")
-      ELSE(NOT ${OPAL_SUBDIR} STREQUAL "win32")
-        FILE(GLOB OPAL_${OPAL_SUBDIR}_FILES 
-          "${OPAL_SUBDIR}/*.h" "${OPAL_SUBDIR}/*.c" "${OPAL_SUBDIR}/*.cc" "${OPAL_SUBDIR}/*.cpp")
-      ENDIF(NOT ${OPAL_SUBDIR} STREQUAL "win32")
       
       SET (OPAL_SOURCE_FILES
         ${OPAL_SOURCE_FILES}
@@ -78,9 +74,7 @@ FOREACH(OPAL_SUBDIR ${OPAL_SUBDIRS})
       
       SOURCE_GROUP("${OPAL_SUBDIR}" FILES ${OPAL_${OPAL_SUBDIR}_FILES})
       
-  ENDIF(NOT ${OPAL_SUBDIR} STREQUAL "mca" AND NOT ${OPAL_SUBDIR} STREQUAL "event"
+  ENDIF(${OPAL_EXCLUDE_SUBDIR} EQUAL -1)
-    AND NOT ${OPAL_SUBDIR} STREQUAL "libltdl" AND NOT ${OPAL_SUBDIR} STREQUAL "include"
-    AND NOT ${OPAL_SUBDIR} STREQUAL "tools")
 
 ENDFOREACH(OPAL_SUBDIR ${OPAL_SUBDIRS})
 

orte/CMakeLists.txt

@@ -16,11 +16,13 @@ PROJECT (ORTE)
 INCLUDE(list_subdirs)
 CHECK_SUBDIRS("${PROJECT_SOURCE_DIR}" ORTE_SUBDIRS)
 
+SET(ORTE_EXCLUDE_SUBDIRS mca test tools)
 
 FOREACH(ORTE_SUBDIR ${ORTE_SUBDIRS})
 
-  IF(NOT ${ORTE_SUBDIR} STREQUAL "mca" AND NOT ${ORTE_SUBDIR} STREQUAL "tools"
+  LIST(FIND ORTE_EXCLUDE_SUBDIRS ${ORTE_SUBDIR} ORTE_EXCLUDE_SUBDIR)
-    AND NOT ${ORTE_SUBDIR} STREQUAL "test")
+
+  IF(${ORTE_EXCLUDE_SUBDIR} EQUAL -1)
       
       FILE(GLOB_RECURSE ORTE_${ORTE_SUBDIR}_FILES 
         "${ORTE_SUBDIR}/*.h" "${ORTE_SUBDIR}/*.c" "${ORTE_SUBDIR}/*.cc" "${ORTE_SUBDIR}/*.cpp")
@@ -32,8 +34,7 @@ FOREACH(ORTE_SUBDIR ${ORTE_SUBDIRS})
       
       SOURCE_GROUP("${ORTE_SUBDIR}" FILES ${ORTE_${ORTE_SUBDIR}_FILES})
       
-  ENDIF(NOT ${ORTE_SUBDIR} STREQUAL "mca" AND NOT ${ORTE_SUBDIR} STREQUAL "tools"
+  ENDIF(${ORTE_EXCLUDE_SUBDIR} EQUAL -1)
-    AND NOT ${ORTE_SUBDIR} STREQUAL "test")
 
 ENDFOREACH(ORTE_SUBDIR ${ORTE_SUBDIRS})