From 59a14df3f443b5e0133b727b419f0b530a394b2a Mon Sep 17 00:00:00 2001 From: khizmax Date: Sun, 26 Feb 2017 16:25:46 +0300 Subject: [PATCH] Fixed CI generator script --- build/CI/cmake-gen | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/build/CI/cmake-gen b/build/CI/cmake-gen index 2151ba38..f1563bfc 100755 --- a/build/CI/cmake-gen +++ b/build/CI/cmake-gen @@ -34,8 +34,6 @@ my $filename="cds-$build-$compiler-$bitness"; open( my $out, ">", $filename ) or die "Cannot open cds-$build-$compiler-$bitness"; print $out "#! /bin/sh\n\n"; -#print $out "PATH=$comp_root:\$PATH\n" if $comp_root; -#print $out "BOOST_ROOT=$boost\n"; print $out "root=$workspace\n"; print $out "CDS_SOURCE=\$root/$cds_source\n"; print $out "OBJ_ROOT=\$root/obj\n"; @@ -49,13 +47,8 @@ print $out "#cp -f run-ctest-rel \$OBJ_ROOT/run-ctest\n" if $build eq 'rel'; print $out "#cp -f run-ctest-dbg \$OBJ_ROOT/run-ctest\n" unless $build eq 'rel'; print $out "cd \$OBJ_ROOT\n"; print $out "\n"; -#print $out "PATH=$comp_root:\$PATH \\\n" if $comp_root; print $out "LD_LIBRARY_PATH=$ld_lib_path:\$LD_LIBRARY_PATH \\\n" if $ld_lib_path; -#print $out "CXX=$cxx \\\n"; -#print $out "CC=$cc \\\n"; -#print $out "CXXFLAGS=\"$cxxflags\" \\\n" if $cxxflags; print $out "LDFLAGS=\"$ldflags\" \\\n" if $ldflags; -#print $out "GTEST_ROOT=\$GTEST_ROOT/$gtest_libs \\\n"; print $out "cmake -G \"Unix Makefiles\" \\\n"; print $out " -DCMAKE_BUILD_TYPE=$cmake_build \\\n"; print $out " -DCMAKE_C_COMPILER=$comp_root/$cc \\\n"; @@ -65,7 +58,7 @@ print $out " -DCDS_BIN_DIR=\$BIN_ROOT \\\n"; print $out " -DWITH_TESTS=ON \\\n"; print $out " -DWITH_ASAN=ON \\\n" if $build eq 'asan'; print $out " -DWITH_TSAN=ON \\\n" if $build eq 'tsan'; -print $out " -DBOOSTROOT=$boost \\\n"; +print $out " -DBOOST_ROOT=$boost \\\n"; print $out " -DBOOST_LIBRARYDIR=\$BOOST_ROOT/$boost_libs \\\n" if $boost_libs; print $out " -DGTEST_INCLUDE_DIRS=$gtest_inc \\\n" if $gtest_inc; print $out " -DGTEST_LIBRARY=$gtest_lib \\\n" if $gtest_lib; -- 2.34.1