WIP: Add SimpleTpl to help test RPATH (#126)

Need to add unit tests for this yet.
TriBITSPub · Oct 27, 2016 · 42d1c48 · 42d1c48
1 parent ae532ca
commit 42d1c48
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 0 deletions.
diff --git a/tribits/examples/TribitsExampleProject/TPLsList.cmake b/tribits/examples/TribitsExampleProject/TPLsList.cmake
@@ -1,4 +1,5 @@
 TRIBITS_REPOSITORY_DEFINE_TPLS(
  MPI "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/FindTPLMPI.cmake" PT
  HeaderOnlyTpl "cmake/tpls/" PT
+ SimpleTpl "cmake/tpls/" ST
  )
diff --git a/tribits/examples/TribitsExampleProject/cmake/tpls/FindTPLSimpleTpl.cmake b/tribits/examples/TribitsExampleProject/cmake/tpls/FindTPLSimpleTpl.cmake
@@ -0,0 +1,5 @@
+TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( SimpleTpl
+ REQUIRED_HEADERS SimpleTpl.hpp
+ REQUIRED_LIBS_NAMES simpletpl
+ MUST_FIND_ALL_HEADERS
+ )
diff --git a/tribits/examples/TribitsExampleProject/packages/simple_cxx/cmake/Dependencies.cmake b/tribits/examples/TribitsExampleProject/packages/simple_cxx/cmake/Dependencies.cmake
@@ -1,3 +1,4 @@
 TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
  LIB_REQUIRED_TPLS HeaderOnlyTpl
+ LIB_OPTIONAL_TPLS SimpleTpl
  )
diff --git a/tribits/examples/TribitsExampleProject/packages/simple_cxx/cmake/SimpleCxx_config.h.in b/tribits/examples/TribitsExampleProject/packages/simple_cxx/cmake/SimpleCxx_config.h.in
@@ -1,5 +1,6 @@
 #cmakedefine HAVE_SIMPLECXX___INT64
 
 #cmakedefine HAVE_SIMPLECXX_DEBUG
+#cmakedefine HAVE_SIMPLECXX_SIMPLETPL
 
 @SIMPLECXX_DEPRECATED_DECLARATIONS@
diff --git a/tribits/examples/TribitsExampleProject/packages/simple_cxx/src/SimpleCxx_HelloWorld.cpp b/tribits/examples/TribitsExampleProject/packages/simple_cxx/src/SimpleCxx_HelloWorld.cpp
@@ -2,6 +2,9 @@
 #include "SimpleCxx_HelloWorld.hpp"
 #include "HeaderOnlyTpl_stuff.hpp"
 
+#ifdef HAVE_SIMPLECXX_SIMPLETPL
+# include "SimpleTpl.hpp"
+#endif
 
 std::string SimpleCxx::deps()
 {
@@ -24,10 +27,15 @@ void HelloWorld::printHelloWorld(std::ostream &out) const
  out << "Release is enabled!\n";
 #endif
  out << "Sqr(3) = " << HeaderOnlyTpl::sqr(3) << "\n";
+
+#ifdef HAVE_SIMPLECXX_SIMPLETPL
+ out << "Cube(3) = " << SimpleTpl::cube(3) << "\n";
+#endif
 #ifdef SIMPLECXX_SHOW_DEPRECATED_WARNINGS
  (void)someOldFunc();
  (void)someOldFunc2();
 #endif
+
 }
 
 

diff --git a/...ts/examples/TribitsExampleProject/packages/simple_cxx/test/SimpleCxx_HelloWorld_Tests.cpp b/...ts/examples/TribitsExampleProject/packages/simple_cxx/test/SimpleCxx_HelloWorld_Tests.cpp
@@ -38,6 +38,10 @@ int main() {
 
  TEST_FIND_SUBSTR_IN_STR("Sqr(3) = 9", oss.str());
 
+#ifdef HAVE_SIMPLECXX_SIMPLETPL
+ TEST_FIND_SUBSTR_IN_STR("Cube(3) = 27", oss.str());
+#endif
+
  if (success) {
  std::cout << "End Result: TEST PASSED\n";
  }

diff --git a/tribits/examples/tpls/SimpleTpl/CMakeLists.txt b/tribits/examples/tpls/SimpleTpl/CMakeLists.txt
@@ -0,0 +1,15 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+
+ADD_LIBRARY(simpletpl SimpleTpl.hpp SimpleTpl.cpp)
+
+INSTALL(
+ TARGETS simpletpl
+ RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/lib"
+ LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib"
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib"
+ )
+
+INSTALL(
+ FILES SimpleTpl.hpp
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/include"
+ )
diff --git a/tribits/examples/tpls/SimpleTpl/SimpleTpl.cpp b/tribits/examples/tpls/SimpleTpl/SimpleTpl.cpp
@@ -0,0 +1,6 @@
+#include "SimpleTpl.hpp"
+
+double SimpleTpl::cube(const double &v)
+{
+ return v*v*v;
+}
diff --git a/tribits/examples/tpls/SimpleTpl/SimpleTpl.hpp b/tribits/examples/tpls/SimpleTpl/SimpleTpl.hpp
@@ -0,0 +1,11 @@
+#ifndef SIMPLE_TPL_HPP
+#define SIMPLE_TPL_HPP
+
+namespace SimpleTpl {
+
+/** \brief . */
+double cube(const double &v);
+
+} // namespace SimpleTpl
+
+#endif // SIMPLE_TPL_HPP