From 3a457f6f0cbab50d136e8d2d121190f5b7aeae0e Mon Sep 17 00:00:00 2001 From: Lenny Truong Date: Mon, 1 Apr 2019 19:54:33 -0700 Subject: [PATCH] Update coreir install to use cmake --- .travis/install_coreir.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis/install_coreir.sh b/.travis/install_coreir.sh index 8db1876b3d..d522dbab28 100755 --- a/.travis/install_coreir.sh +++ b/.travis/install_coreir.sh @@ -10,11 +10,13 @@ if [ "$TRAVIS_BRANCH" == "coreir-dev" ]; then cd deps; git clone -b dev https://github.com/rdaly525/coreir.git; cd coreir; - export COREIRCONFIG="g++-4.9"; - export COREIR=$PWD; - make install prefix=$TRAVIS_BUILD_DIR/deps; - cd ..; - cd ..; + export CXX="g++-4.9"; + cd build + cmake -DCMAKE_INSTALL_PREFIX:PATH=$TRAVIS_BUILD_DIR/deps .. + make install; + cd ..; # build + cd ..; # coreir + cd ..; # deps export PATH=$TRAVIS_BUILD_DIR/deps/bin:$PATH; export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/deps/lib:$LD_LIBRARY_PATH; pip install --upgrade git+git://github.com/leonardt/pycoreir.git@dev;