summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-04-20 13:52:38 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-04-20 13:52:38 (GMT)
commit0d4c75ecfbabc55b5705f21982a84ab5fa6b7e18 (patch)
treecff5e5cdcd2e14cf2c43dd94f975c03c2c94c801 /Tests
parent2ecadc96bc1d3dc8fd4d5c1ee9295a944436d070 (diff)
parent2c1b720e643aafd725a8c0be11913834704d7269 (diff)
downloadCMake-0d4c75ecfbabc55b5705f21982a84ab5fa6b7e18.zip
CMake-0d4c75ecfbabc55b5705f21982a84ab5fa6b7e18.tar.gz
CMake-0d4c75ecfbabc55b5705f21982a84ab5fa6b7e18.tar.bz2
Merge topic 'boost-import-default'
2c1b720e FindBoost: Define Boost::boost for all boost versions
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CFBundleTest/Localized.rsrcbin496 -> 472 bytes
-rw-r--r--Tests/FindBoost/CMakeLists.txt11
-rw-r--r--Tests/FindBoost/TestHeaders/CMakeLists.txt10
-rw-r--r--Tests/FindBoost/TestHeaders/main.cxx9
4 files changed, 30 insertions, 0 deletions
diff --git a/Tests/CFBundleTest/Localized.rsrc b/Tests/CFBundleTest/Localized.rsrc
index cbf3523..7973c1f 100644
--- a/Tests/CFBundleTest/Localized.rsrc
+++ b/Tests/CFBundleTest/Localized.rsrc
Binary files differ
diff --git a/Tests/FindBoost/CMakeLists.txt b/Tests/FindBoost/CMakeLists.txt
index 259ee26..0e9527d 100644
--- a/Tests/FindBoost/CMakeLists.txt
+++ b/Tests/FindBoost/CMakeLists.txt
@@ -8,3 +8,14 @@ add_test(NAME FindBoost.Test COMMAND
--build-options ${build_options}
--test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>
)
+
+add_test(NAME FindBoost.TestHeaders COMMAND
+ ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>
+ --build-and-test
+ "${CMake_SOURCE_DIR}/Tests/FindBoost/TestHeaders"
+ "${CMake_BINARY_DIR}/Tests/FindBoost/TestHeaders"
+ ${build_generator_args}
+ --build-project TestFindBoostHeaders
+ --build-options ${build_options}
+ --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>
+ )
diff --git a/Tests/FindBoost/TestHeaders/CMakeLists.txt b/Tests/FindBoost/TestHeaders/CMakeLists.txt
new file mode 100644
index 0000000..d7be327
--- /dev/null
+++ b/Tests/FindBoost/TestHeaders/CMakeLists.txt
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.1)
+project(TestFindBoostHeaders CXX)
+include(CTest)
+
+find_package(Boost REQUIRED)
+
+add_executable(test_boost_headers_tgt main.cxx)
+target_link_libraries(test_boost_headers_tgt
+ Boost::boost)
+add_test(NAME test_boost_headers_tgt COMMAND test_boost_headers_tgt)
diff --git a/Tests/FindBoost/TestHeaders/main.cxx b/Tests/FindBoost/TestHeaders/main.cxx
new file mode 100644
index 0000000..0400d6d
--- /dev/null
+++ b/Tests/FindBoost/TestHeaders/main.cxx
@@ -0,0 +1,9 @@
+#include <boost/any.hpp>
+
+int main() {
+ boost::any a;
+ a = 5;
+ a = std::string("A string");
+
+ return 0;
+}