Automatic snapshot commit from tribits at 1d1334b

Origin repo remote tracking branch: 'github/master' Origin repo remote repo URL: 'github = [email protected]:TriBITSPub/TriBITS.git' At commit: commit 1d1334bbe67bb82184c64445a6d946d4a5ad35b7 Author: Roscoe A. Bartlett <[email protected]> Date: Tue Apr 23 10:17:36 2019 -0600 Summary: Fix case for optional missing component (#2689)
trilinos · Apr 23, 2019 · f1b5c79 · f1b5c79
1 parent fc19528
commit f1b5c79
Showing 1 changed file with 25 additions and 34 deletions.
diff --git a/cmake/tribits/core/installation/TribitsProjectConfigTemplate.cmake.in b/cmake/tribits/core/installation/TribitsProjectConfigTemplate.cmake.in
@@ -107,32 +107,32 @@ ENDIF()
 # the required components wasn't found.
 SET(${PROJECT_NAME}_FOUND TRUE)
 FOREACH(comp ${PDOLLAR}{COMPONENTS_LIST})
-   SET(
-     INCLUDE_FILE
-     ${PDOLLAR}{CMAKE_CURRENT_LIST_DIR}/../${PDOLLAR}{comp}/${PDOLLAR}{comp}Config.cmake
-     )
-   IF (EXISTS ${PDOLLAR}{INCLUDE_FILE})
-       # Set ${PROJECT_NAME}_<component>_FOUND.
-       SET(${PROJECT_NAME}_${PDOLLAR}{comp}_FOUND TRUE)
-       # Include the package file.
-       INCLUDE(${PDOLLAR}{INCLUDE_FILE})
-       # Add variables to lists.
-       LIST(APPEND ${PROJECT_NAME}_INCLUDE_DIRS ${PDOLLAR}{${PDOLLAR}{comp}_INCLUDE_DIRS})
-       LIST(APPEND ${PROJECT_NAME}_LIBRARY_DIRS ${PDOLLAR}{${PDOLLAR}{comp}_LIBRARY_DIRS})
-       LIST(APPEND ${PROJECT_NAME}_LIBRARIES ${PDOLLAR}{${PDOLLAR}{comp}_LIBRARIES})
-       LIST(APPEND ${PROJECT_NAME}_TPL_INCLUDE_DIRS ${PDOLLAR}{${PDOLLAR}{comp}_TPL_INCLUDE_DIRS})
-       LIST(APPEND ${PROJECT_NAME}_TPL_LIBRARY_DIRS ${PDOLLAR}{${PDOLLAR}{comp}_TPL_LIBRARY_DIRS})
-       LIST(APPEND ${PROJECT_NAME}_TPL_LIBRARIES ${PDOLLAR}{${PDOLLAR}{comp}_TPL_LIBRARIES})
-   ELSE()
-       # Component not found.
-       MESSAGE(WARNING "Component \"${PDOLLAR}{comp}\" NOT found.")
-       # Set ${PROJECT_NAME}_<component>_FOUND to FALSE.
-       SET(${PROJECT_NAME}_${PDOLLAR}{comp}_FOUND FALSE)
-       # Set ${PROJECT_NAME}_FOUND to FALSE if component is not optional.
-       IF(${PROJECT_NAME}_FIND_REQUIRED_${PDOLLAR}{comp})
-           SET(${PROJECT_NAME}_FOUND FALSE)
-       ENDIF()
+  SET(
+    INCLUDE_FILE
+    ${PDOLLAR}{CMAKE_CURRENT_LIST_DIR}/../${PDOLLAR}{comp}/${PDOLLAR}{comp}Config.cmake
+    )
+ IF (EXISTS ${PDOLLAR}{INCLUDE_FILE})
+   # Set ${PROJECT_NAME}_<component>_FOUND.
+   SET(${PROJECT_NAME}_${PDOLLAR}{comp}_FOUND TRUE)
+   # Include the package file.
+   INCLUDE(${PDOLLAR}{INCLUDE_FILE})
+   # Add variables to lists.
+   LIST(APPEND ${PROJECT_NAME}_INCLUDE_DIRS ${PDOLLAR}{${PDOLLAR}{comp}_INCLUDE_DIRS})
+   LIST(APPEND ${PROJECT_NAME}_LIBRARY_DIRS ${PDOLLAR}{${PDOLLAR}{comp}_LIBRARY_DIRS})
+   LIST(APPEND ${PROJECT_NAME}_LIBRARIES ${PDOLLAR}{${PDOLLAR}{comp}_LIBRARIES})
+   LIST(APPEND ${PROJECT_NAME}_TPL_INCLUDE_DIRS ${PDOLLAR}{${PDOLLAR}{comp}_TPL_INCLUDE_DIRS})
+   LIST(APPEND ${PROJECT_NAME}_TPL_LIBRARY_DIRS ${PDOLLAR}{${PDOLLAR}{comp}_TPL_LIBRARY_DIRS})
+   LIST(APPEND ${PROJECT_NAME}_TPL_LIBRARIES ${PDOLLAR}{${PDOLLAR}{comp}_TPL_LIBRARIES})
+ ELSE()
+   # Component not found.
+   MESSAGE(WARNING "Component \"${PDOLLAR}{comp}\" NOT found.")
+   # Set ${PROJECT_NAME}_<component>_FOUND to FALSE.
+   SET(${PROJECT_NAME}_${PDOLLAR}{comp}_FOUND FALSE)
+   # Set ${PROJECT_NAME}_FOUND to FALSE if component is not optional.
+   IF(${PROJECT_NAME}_FIND_REQUIRED_${PDOLLAR}{comp})
+     SET(${PROJECT_NAME}_FOUND FALSE)
    ENDIF()
+ ENDIF()
 ENDFOREACH()
 
 # Resolve absolute paths and remove duplicate paths
@@ -197,12 +197,3 @@ SET(${PROJECT_NAME}_PACKAGE_LIST "${FULL_PACKAGE_SET}")
 
 ## The TPLs enabled for this project
 SET(${PROJECT_NAME}_TPL_LIST "${FULL_TPL_SET}")
-
-## Load configurations for enabled packages in components list
-FOREACH(comp ${PDOLLAR}{COMPONENTS_LIST})
-  SET(
-    PACKAGE_CONFIG_INCLUDE_FILE
-    "${PDOLLAR}{CMAKE_CURRENT_LIST_DIR}/../${PDOLLAR}{comp}/${PDOLLAR}{comp}Config.cmake"
-    )
-  INCLUDE("${PDOLLAR}{PACKAGE_CONFIG_INCLUDE_FILE}")
-ENDFOREACH()