always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

google_sparsehash -> sparsehash; bump version to 2.0.2

Browse Source
This commit is contained in:
lperron@google.com
2012-03-04 14:52:23 +00:00
parent f091eadc59
commit 64e1745203
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
makefiles/Makefile.third_party.unix
View File

@@ -2,7 +2,7 @@
GFLAGS_TAG = 76 # version 2.0
PROTOBUF_TAG = 391 # version 2.4.1
GOOGLE_APPUTILS_TAG = 11 # trunk
GOOGLE_SPARSEHASH_TAG = 105 # trunk
SPARSEHASH_TAG = 116 # 2.0.2
CBC_TAG = 2.7.6
SWIG_TAG = rel-2.0.4
PCRE_TAG = 800 # version 8.21
@@ -57,7 +57,7 @@ build_third_party: \
install_gflags \
install_protobuf \
install_google_apputils \
install_google_sparsehash \
install_sparsehash \
install_swig \
install_coin_cbc \
install_glpk \
@@ -100,8 +100,8 @@ install_google_apputils: dependencies/sources/google-apputils/README
dependencies/sources/google-apputils/README:
svn co http://google-apputils-python.googlecode.com/svn/trunk/ -r $(GOOGLE_APPUTILS_TAG) dependencies/sources/google-apputils
# Install google-sparsehash.
install_google_sparsehash: dependencies/install/include/google/dense_hash_map
# Install sparsehash.
install_sparsehash: dependencies/install/include/google/dense_hash_map
dependencies/install/include/google/dense_hash_map: dependencies/sources/sparsehash/Makefile
cd dependencies/sources/sparsehash && make install
@@ -113,7 +113,7 @@ dependencies/sources/sparsehash/configure: dependencies/sources/sparsehash/autog
cd dependencies/sources/sparsehash && ./autogen.sh
dependencies/sources/sparsehash/autogen.sh:
svn co http://google-sparsehash.googlecode.com/svn/trunk/ -r $(GOOGLE_SPARSEHASH_TAG) dependencies/sources/sparsehash
svn co http://sparsehash.googlecode.com/svn/trunk/ -r $(SPARSEHASH_TAG) dependencies/sources/sparsehash
# Install Coin CBC.

10
makefiles/Makefile.third_party.win
View File

@@ -2,7 +2,7 @@
GFLAGS_TAG = 76 # version 2.0
PROTOBUF_TAG = 391 # version 2.4.1
GOOGLE_APPUTILS_TAG = 11 # trunk
GOOGLE_SPARSEHASH_TAG = 103 # trunk
SPARSEHASH_TAG = 116 # 2.0.2
CLP_TAG = 1.14.4
CBC_TAG = 2.7.6
@@ -48,7 +48,7 @@ build_third_party: \
install_swig \
install_coin_cbc \
install_glpk
# install_google_sparsehash \
# install_sparsehash \
# install_scip
download_third_party: \
@@ -155,8 +155,8 @@ install_google_apputils: dependencies\sources\google-apputils\README
dependencies\sources\google-apputils\README:
svn co http://google-apputils-python.googlecode.com/svn/trunk/ -r $(GOOGLE_APPUTILS_TAG) dependencies/sources/google-apputils
# Install google-sparsehash.
install_google_sparsehash: dependencies\install\include\google\dense_hash_map
# Install sparsehash.
install_sparsehash: dependencies\install\include\google\dense_hash_map
dependencies\install\include\google\dense_hash_map: dependencies\sources\sparsehash\Makefile
cd dependencies\sources\sparsehash && make install
@@ -168,7 +168,7 @@ dependencies\sources\sparsehash\configure: dependencies\sources\sparsehash\autog
cd dependencies\sources\sparsehash && ./autogen.sh
dependencies\sources\sparsehash\autogen.sh:
svn co http://google-sparsehash.googlecode.com/svn/trunk/ -r $(GOOGLE_SPARSEHASH_TAG) dependencies/sources/sparsehash
svn co http://google-sparsehash.googlecode.com/svn/trunk/ -r $(SPARSEHASH_TAG) dependencies/sources/sparsehash
# Install Coin CBC.
install_coin_cbc: dependencies\install\bin\cbc.exe