Skip to content

Commit

Permalink
use project source dirs to find prereq files
Browse files Browse the repository at this point in the history
  • Loading branch information
rdeits committed Aug 12, 2015
1 parent a33fe91 commit 1624e35
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ endif()



set(EXTERNAL_SOURCE_DIRS)
foreach (proj ${EXTERNAL_PROJECTS})
set(deps)
foreach(dep ${${proj}_dependencies})
Expand All @@ -164,6 +165,7 @@ foreach (proj ${EXTERNAL_PROJECTS})
if (NOT ${proj}_NO_BUILD)
set(${proj}_BUILD_COMMAND ${PODS_MAKE_COMMAND} BUILD_PREFIX=${CMAKE_INSTALL_PREFIX} BUILD_TYPE=${CMAKE_BUILD_TYPE})
endif()
set(EXTERNAL_SOURCE_DIRS ${EXTERNAL_SOURCE_DIRS} ${${proj}_SOURCE_DIR} "\n")

message(STATUS "Preparing to build ${proj} with dependencies: ${deps}")

Expand Down Expand Up @@ -231,6 +233,7 @@ foreach (proj ${EXTERNAL_PROJECTS})
ALWAYS 1)

endforeach()
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/drake_external_source_dirs.txt ${EXTERNAL_SOURCE_DIRS})


# todo: add a custom target for release_filelist
Expand Down
9 changes: 8 additions & 1 deletion externals/install_prereqs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,14 @@ case $1 in
exit 1 ;;
esac

SUBDIRS=`ls`
if [ -e "../pod-build/drake_external_source_dirs.txt" ]
then
SUBDIRS=`cat ../pod-build/drake_external_source_dirs.txt`
else
echo "install_prereqs could not find the list of external source directories. Please run 'make download-all' first." 1>&2
exit 1
fi

for subdir in $SUBDIRS; do
if [ -f $subdir/install_prereqs.sh ]; then
echo "installing prereqs for $subdir"
Expand Down

0 comments on commit 1624e35

Please sign in to comment.