Skip to content

Commit

Permalink
- Removed profile/ build
Browse files Browse the repository at this point in the history
 - Made opencv depend on eigen
  • Loading branch information
ylow committed Jul 3, 2012
1 parent aef7178 commit 57a923c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 26 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ ExternalProject_Add(opencv
-DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_PACKAGE=OFF -DBUILD_EXAMPLES=OFF -DOPENCV_BUILD_3RDPARTY_LIBS=ON -DBUILD_SHARED_LIBS=ON -DBUILD_DOCS=OFF -DBUILD_JPEG=ON -DCMAKE_INCLUDE_PATH=${GraphLab_SOURCE_DIR}/deps/local/include -DWITH_CUBLAS=OFF -DWITH_1394=OFF -DWITH_AVFOUNDATION=OFF -DWITH_CUDA=OFF -DWITH_CUFFT=OFF -DWITH_FFMPEG=OFF -DWITH_GSTREAMER=OFF -DWITH_GTK=OFF -DWITH_QUICKTIME=OFF -DWITH_VIDEOINPUT=OFF -DWITH_XIMEA=OFF -DWITH_XINE=OFF -DWITH_V4L=OFF -DWITH_UNICAP=OFF -DWITH_QT=OFF -DWITH_JASPER=NO -DWITH_TIFF=NO -DCMAKE_LIBRARY_PATH=${GraphLab_SOURCE_DIR}/deps/local/lib
INSTALL_DIR ${GraphLab_SOURCE_DIR}/deps/local)

add_dependencies(opencv eigen)

macro(requires_opencv NAME)
get_target_property(tmp ${NAME} COMPILE_FLAGS)
Expand Down
28 changes: 2 additions & 26 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ function run_cleanup {
echo "Are you sure you want to continue? (yes or no)"
read yesorno;
if [ "$yesorno" == "yes" ]; then
echo "Removing release debug and profile folders";
rm -rf release debug profile deps configure.deps
echo "Removing release and debug folders";
rm -rf release debug deps configure.deps
else
echo "Doing nothing!";
fi
Expand All @@ -68,7 +68,6 @@ function check_version {
## is defined in configure.deps
RELEASE_DIR=release
DEBUG_DIR=debug
PROFILE_DIR=profile
INSTALL_DIR=/usr/local
EXPERIMENTAL=false
GRAPHLAB_HOME=$PWD
Expand Down Expand Up @@ -241,9 +240,6 @@ echo -e "\t RELEASE_DIR=$RELEASE_DIR" >> configure.deps
echo -e "# Debug build directory (optimization disabled):" >> configure.deps
echo -e "\t DEBUG_DIR=$DEBUG_DIR" >> configure.deps

echo -e "# Profile build directory (extra counters enabled):" >> configure.deps
echo -e "\t PROFILE_DIR=$PROFILE_DIR" >> configure.deps

echo -e "# Directory in which graphlab is installed (prefix):" >> configure.deps
echo -e "\t INSTALL_DIR=$INSTALL_DIR" >> configure.deps

Expand Down Expand Up @@ -344,26 +340,6 @@ eval $build_cmd | tee -a ../$LOG_FILE
cd $GRAPHLAB_HOME


echo -e "\n\n\n======================= Profile ========================" \
| tee -a $LOG_FILE

if [ ! -d $PROFILE_DIR ]; then
mkdir $PROFILE_DIR
fi
cd $PROFILE_DIR
rm -f CMakeCache.txt
build_cmd="$CMAKE \
$GENERATOR \
-D CMAKE_BUILD_TYPE=Release \
-D COMPILE_PROFILING=1 \
$CFLAGS \
../."

echo $build_cmd | tee -a ../$LOG_FILE
eval $build_cmd | tee -a ../$LOG_FILE
cd $GRAPHLAB_HOME





0 comments on commit 57a923c

Please sign in to comment.