Merge pull request #1158 from jphickey/fix-790-install-symlink

Fix #790, allow directories and symlinks in FILELIST.

Author: astrogeco

cmake/arch_build.cmake

@@ -474,14 +474,19 @@ function(process_arch SYSVAR)
     add_subdirectory(cmake/target ${TGTNAME})
 
     foreach(INSTFILE ${${TGTNAME}_FILELIST})
-      if(EXISTS ${MISSION_DEFS}/${TGTNAME}_${INSTFILE})
+      if(EXISTS ${MISSION_DEFS}/${TGTNAME}/${INSTFILE})
+        set(FILESRC ${MISSION_DEFS}/${TGTNAME}/${INSTFILE})
+      elseif(EXISTS ${MISSION_DEFS}/${TGTNAME}_${INSTFILE})
         set(FILESRC ${MISSION_DEFS}/${TGTNAME}_${INSTFILE})
       elseif(EXISTS ${MISSION_DEFS}/${INSTFILE})
         set(FILESRC ${MISSION_DEFS}/${INSTFILE})
       else()
         set(FILESRC)
       endif()
       if (FILESRC)
+        # In case the file is a symlink, follow it to get to the actual file
+        get_filename_component(FILESRC "${FILESRC}" REALPATH)
+        message("NOTE: Selected ${FILESRC} as source for ${INSTFILE} on ${TGTNAME}")
         install(FILES ${FILESRC} DESTINATION ${TGTNAME}/${INSTALL_SUBDIR} RENAME ${INSTFILE})
       else(FILESRC)
         message("WARNING: Install file ${INSTFILE} for ${TGTNAME} not found")