summaryrefslogtreecommitdiff
path: root/test cases/frameworks
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-03-24 15:04:51 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2013-03-24 15:04:51 +0200
commit70f6b769a69aa741bd7757d82829e50a93303c50 (patch)
treec020d416c6d3b07e119b6b4dc2ef9fdacc776bc4 /test cases/frameworks
parent92084b6d9e71fc32a2e33658e2623003b14d4b0d (diff)
downloadmeson-70f6b769a69aa741bd7757d82829e50a93303c50.tar.gz
Added custom detector framework and a Boost detector to it.
Diffstat (limited to 'test cases/frameworks')
-rw-r--r--test cases/frameworks/1 boost/meson.build13
-rw-r--r--test cases/frameworks/1 boost/nolinkexe.cc20
2 files changed, 5 insertions, 28 deletions
diff --git a/test cases/frameworks/1 boost/meson.build b/test cases/frameworks/1 boost/meson.build
index 15455c507..968cf232b 100644
--- a/test cases/frameworks/1 boost/meson.build
+++ b/test cases/frameworks/1 boost/meson.build
@@ -1,14 +1,11 @@
project('boosttest', 'cxx')
-# One test case for a Boost module that is
-# header only and one test case for a module that
-# requires linking with a shared library.
+# Use a Boost module that requires a shared library.
+# Eventually we would like to be able to detect Boost
+# multiple times with different library combinations.
-nolinkdep = find_dep('boost', modules : 'utility', required : true)
linkdep = find_dep('boost', modules : 'thread', required : true)
-nolinkexe = executable('nolinkexe', 'nolinkexe.cc', dep : nolinkdep)
-linkexe = executable('linkedexe', 'linkexe.cc', dep : linkdep)
+linkexe = executable('linkedexe', 'linkexe.cc', deps : linkdep)
-add_test('nolinktest', nolinkexe)
-add_test('linktext', linkexe)
+add_test('Boost linktext', linkexe)
diff --git a/test cases/frameworks/1 boost/nolinkexe.cc b/test cases/frameworks/1 boost/nolinkexe.cc
deleted file mode 100644
index e81f3fb31..000000000
--- a/test cases/frameworks/1 boost/nolinkexe.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-#include<boost/utility.hpp>
-
-class MyClass : boost::noncopyable {
-private:
- int x;
-
-public:
- MyClass() {
- x = 44;
- }
-
- int getValue() const { return x; }
-};
-
-int main(int argc, char **argv) {
- MyClass foo;
- if(foo.getValue() == 44)
- return 0;
- return 1;
-}