my $cc=get_prop("cc") or $compiler;
my $cxxflags=get_prop("cxxflags");
my $ldflags=get_prop("ldflags");
+my $cmake_exe_ldflags=get_prop("exe-ldflags");
my $ext_lib=get_prop("extlib");
my $ld_lib_path=get_prop("ld-lib-path");
-
+my $cmake_flags=get_prop("cmake-flags");
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";
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";
print $out " -DCMAKE_CXX_COMPILER=$comp_root/$cxx \\\n";
print $out " -DCMAKE_CXX_FLAGS=\"$cxxflags\" \\\n" if $cxxflags;
+print $out " -DCMAKE_EXE_LINKER_FLAGS=\"$cmake_exe_ldflags\" \\\n" if $cmake_exe_ldflags;
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;
+print $out " -DGTEST_LIBRARIES=$gtest_lib \\\n" if $gtest_lib;
print $out " -DEXTERNAL_SYSTEM_LIBS=\"$ext_lib\" \\\n" if $ext_lib;
+print $out " $cmake_flags \\\n" if $cmake_flags;
print $out " \$CDS_SOURCE && \\\n";
print $out "make -j $make_jobs \$* \n";