From 06355441ea999d62d0412fa39b28d35371ce4df3 Mon Sep 17 00:00:00 2001 From: K4YT3X Date: Sat, 13 Jun 2020 10:53:12 -0400 Subject: [PATCH] using gcc/g++ 8 to provide CC/CXX for cmake via environment variable instead of linking --- src/video2x_setup_ubuntu.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/video2x_setup_ubuntu.sh b/src/video2x_setup_ubuntu.sh index e50ee16..c9f869a 100755 --- a/src/video2x_setup_ubuntu.sh +++ b/src/video2x_setup_ubuntu.sh @@ -64,9 +64,8 @@ apt-fast install -y --no-install-recommends autoconf build-essential cmake gcc-8 git clone --recurse-submodules --depth=1 --progress --recurse-submodules https://github.com/nagadomi/waifu2x-caffe-ubuntu.git $TEMP/waifu2x-caffe-ubuntu git clone --recurse-submodules --progress --depth=1 https://github.com/nagadomi/caffe.git $TEMP/waifu2x-caffe-ubuntu/caffe -apt-get purge -y gcc g++ -ln -s /usr/bin/gcc-8 /usr/bin/gcc -ln -s /usr/bin/g++-8 /usr/bin/g++ +export CC=/usr/bin/gcc-8 +export CXX=/usr/bin/g++-8 mkdir -v -p $TEMP/waifu2x-caffe-ubuntu/build cd $TEMP/waifu2x-caffe-ubuntu/build cmake .. -DCMAKE_INSTALL_PREFIX=/usr