From 865be1e4315e2c938b10efc3d06c4e49664d2d03 Mon Sep 17 00:00:00 2001 From: "Meredith L. Patterson" <mlp@thesmartpolitenerd.com> Date: Thu, 16 Jan 2014 19:45:32 +0100 Subject: [PATCH] scons bindings=cpp test works --- src/bindings/cpp/SConscript | 9 ++++++++- src/bindings/cpp/hammer/hammer.cpp | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) delete mode 100644 src/bindings/cpp/hammer/hammer.cpp diff --git a/src/bindings/cpp/SConscript b/src/bindings/cpp/SConscript index bd9a90ea..01345a72 100644 --- a/src/bindings/cpp/SConscript +++ b/src/bindings/cpp/SConscript @@ -1,5 +1,6 @@ # -*- python -*- -Import("env libhammer_shared") +import os.path +Import("env libhammer_shared testruns targets") cppenv = env.Clone() cppenv.Append(CPPPATH=[".", "vendor/gtest-1.7.0/fused-src", "../.."]) @@ -10,4 +11,10 @@ gtest = cppenv.Object("vendor/gtest-1.7.0/fused-src/gtest/gtest-all.cc") hammer_test = cppenv.Program("hammer_test", libhammer_shared + gtest + ['cpp_tests.cpp']) +cpptest = Alias('testcpp', [hammer_test], "".join(["env LD_LIBRARY_PATH=", os.path.dirname(str(libhammer_shared[0])), " ", hammer_test[0].path])) +AlwaysBuild(cpptest) +testruns.append(cpptest) +cppinstallexec = cppenv.Install("$incpath", ['hammer/hammer.hpp', 'hammer/hammer_test.hpp']) +cppinstall = Alias("installcpp", [cppinstallexec], cppinstallexec) +targets.append(cppinstall) diff --git a/src/bindings/cpp/hammer/hammer.cpp b/src/bindings/cpp/hammer/hammer.cpp deleted file mode 100644 index 8b137891..00000000 --- a/src/bindings/cpp/hammer/hammer.cpp +++ /dev/null @@ -1 +0,0 @@ - -- GitLab