Skip to content

Commit

Permalink
Merge branch 'master' into cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
pjotrp committed Apr 26, 2009
2 parents 29122d2 + da922cf commit 6d28caa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ project (BIOLIB)
ENABLE_TESTING()
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/tools/cmake-support/modules/")
message("CMake modules: ${CMAKE_MODULE_PATH}")

FIND_PACKAGE(GitSubmodule)

include(CheckIncludeFiles)

message("Building biolib:")
Expand Down
6 changes: 0 additions & 6 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@ if [ ! -d ./src ]; then
exit 1
fi

if [ -d .git ]; then
echo "Updating git submodules"
git submodule init
git submodule update
fi

language=$1
if [ -z $language ]; then
language='--with-perl'
Expand Down

0 comments on commit 6d28caa

Please sign in to comment.