Skip to content

Commit f29225c

Browse files
committed
Upgrade to cmake 2.8.3. Remove old patches that are not needed anymore.
1 parent 8e3e8c1 commit f29225c

File tree

8 files changed

+5
-262
lines changed

8 files changed

+5
-262
lines changed

auto_build.sh

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fi
1818
install_base=$base/install
1919
xinstall_base=$base/install/cross
2020
git_install_dir=$install_base/git-1.7.3
21-
cmake_install_dir=$install_base/cmake-2.8.2
21+
cmake_install_dir=$install_base/cmake-2.8.3
2222
osmesa_install_dir=$install_base/osmesa-7.6.1
2323
osmesa_xinstall_dir=$xinstall_base/osmesa-7.6.1
2424
python_install_dir=$install_base/python-2.5.2
@@ -72,19 +72,16 @@ rm -rf $base/source/cmake
7272
mkdir -p $base/source/cmake
7373
cd $base/source/cmake
7474

75-
package=cmake-2.8.2
75+
package=cmake-2.8.3
7676
grab http://www.cmake.org/files/v2.8 $package.tar.gz
7777
tar -zxf $package.tar.gz
7878

79-
# Fix FindMPI.cmake for BGL
80-
patch -p1 -d $package -i $script_dir/find_mpi_fix.diff
81-
8279
mkdir build
8380
cd build
8481
../$package/bootstrap --prefix=$cmake_install_dir
8582
$make_command && make install
8683

87-
# install extra platform files, this can be removed when they are part of cmake
84+
# install extra platform files
8885
cp $script_dir/cmake-platform-files/* $cmake_install_dir/share/cmake-2.8/Modules/Platform/
8986
}
9087

@@ -101,8 +98,8 @@ cd build
10198
../CMakeNext/bootstrap --prefix=$cmake_install_dir
10299
$make_command && make install
103100

104-
# install extra platform files, this can be removed when they are part of cmake
105-
#cp $script_dir/cmake-platform-files/* $cmake_install_dir/share/cmake-2.8/Modules/Platform/
101+
# install extra platform files
102+
cp $script_dir/cmake-platform-files/* $cmake_install_dir/share/cmake-2.8/Modules/Platform/
106103
}
107104

108105

cmake-2.8.2.tar.gz

-5.14 MB
Binary file not shown.

cmake-2.8.3.tar.gz

5.18 MB
Binary file not shown.

cmake-fix-bootstrap.patch

Lines changed: 0 additions & 106 deletions
This file was deleted.

cmake-platform-files/BlueGeneP-static.cmake

Lines changed: 0 additions & 11 deletions
This file was deleted.

cmake-platform-files/BlueGeneP.cmake

Lines changed: 0 additions & 11 deletions
This file was deleted.

cmake-platform-files/BlueGenePBase.cmake

Lines changed: 0 additions & 97 deletions
This file was deleted.

find_mpi_fix.diff

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)