Merge branch '17-radixdl-visibility' into 'master'

Resolve "radixdl visibility"

Closes #17

See merge request !28

cmake/Dependencies.cmake

 TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
    SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS
      bug  radixbug      SS OPTIONAL
-     dl   radixdl       SS OPTIONAL
      core radixcore     SS OPTIONAL
+     dl   radixdl       SS OPTIONAL
      pattern radixpattern SS OPTIONAL
      algorithm radixalgorithm SS OPTIONAL
      para radixpara     SS OPTIONAL

radixalgorithm/cmake/Dependencies.cmake

 
 TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
-   LIB_REQUIRED_PACKAGES radixdl
+   LIB_REQUIRED_PACKAGES radixcore
    LIB_OPTIONAL_TPLS
    TEST_REQUIRED_PACKAGES testframework
 )

radixalgorithm/ordering.hh

@@ -3,7 +3,7 @@
 #include <radixbug/bug.hh>
 #include <utility>  // swap
 #include <vector>
-#include "radixdl/visibility.hh"
+#include "radixcore/visibility.hh"
 
 namespace radix
 {

radixams/cmake/Dependencies.cmake

@@ -9,7 +9,7 @@ ELSE()
 ENDIF()
 
 TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
-   LIB_REQUIRED_PACKAGES radixcommand radixmath radixbug
+   LIB_REQUIRED_PACKAGES radixcommand radixmath radixcore radixbug
    LIB_OPTIONAL_TPLS ${QT_PACKAGES}
 )
 

radixcommand/cmake/Dependencies.cmake

 TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
-LIB_REQUIRED_PACKAGES radixdl radixbug
+LIB_REQUIRED_PACKAGES radixcore radixbug
 LIB_OPTIONAL_PACKAGES
 TEST_REQUIRED_PACKAGES testframework
 TEST_OPTIONAL_PACKAGES

radixcommand/commandline.hh

@@ -8,7 +8,7 @@
 #include <unordered_set>
 #include <vector>
 
-#include "radixdl/visibility.hh"
+#include "radixcore/visibility.hh"
 
 namespace radix
 {

radixcore/CMakeLists.txt

 TRIBITS_SUBPACKAGE(core)
 
+TRIBITS_CONFIGURE_FILE(visibility.hh)
+
 SET(HEADERS
 system.hh
 stringfunctions.i.hh

radixcore/cmake/Dependencies.cmake

 TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
-LIB_REQUIRED_PACKAGES radixdl
+LIB_REQUIRED_PACKAGES
 LIB_OPTIONAL_PACKAGES
 TEST_REQUIRED_PACKAGES testframework
 TEST_OPTIONAL_PACKAGES

radixcore/cmake/visibility.hh.in

+#ifndef RADIX_RADIXCORE_VISIBILITY_HH_
+#define RADIX_RADIXCORE_VISIBILITY_HH_
+#cmakedefine BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@
+#if defined _WIN32 || defined __CYGWIN__
+  #define RADIX_PUBLIC __declspec(dllexport)
+  #define RADIX_LOCAL
+#else
+  #define RADIX_PUBLIC
+  #define RADIX_LOCAL __declspec(dllimport)
+#endif
+#endif /* RADIX_RADIXCORE_VISIBILITY_HH_*/

radixcore/stringfunctions.hh

@@ -13,7 +13,7 @@
 #include <string>
 #include <vector>
 
-#include "radixdl/visibility.hh"
+#include "radixcore/visibility.hh"
 
 namespace radix
 {

radixcore/system.hh

@@ -12,7 +12,7 @@
 #include <string>
 #include <vector>
 
-#include "radixdl/visibility.hh"
+#include "radixcore/visibility.hh"
 
 namespace radix
 {

radixdl/CMakeLists.txt

 TRIBITS_SUBPACKAGE(dl)
 
-TRIBITS_CONFIGURE_FILE(visibility.hh)
 
 SET(SOURCE
 library.cc

radixdl/cmake/Dependencies.cmake

 TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
-LIB_REQUIRED_PACKAGES
+LIB_REQUIRED_PACKAGES radixcore
 LIB_OPTIONAL_PACKAGES
 TEST_REQUIRED_PACKAGES
 TEST_OPTIONAL_PACKAGES

radixdl/function.hh

@@ -7,7 +7,7 @@
 #include <windows.h>
 #endif
 
-#include "radixdl/visibility.hh"
+#include "radixcore/visibility.hh"
 #if defined(_WIN32)
 #include "windef.h"
 #endif

radixdl/library.hh

@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "radixdl/function.hh"
-#include "radixdl/visibility.hh"
+#include "radixcore/visibility.hh"
 
 namespace radix
 {

radixdl/tests/fake_lib/libfunction.cc

 #include "radixdl/tests/fake_lib/libfunction.hh"
-#include "radixdl/visibility.hh"
+#include "radixcore/visibility.hh"
 
 namespace radix
 {

radixdl/tests/fake_lib/libfunction.hh

 #ifndef FAKE_LIB_LIBFUNCTION_HH_
 #define FAKE_LIB_LIBFUNCTION_HH_
 
-#include "radixdl/visibility.hh"
+#include "radixcore/visibility.hh"
 
 namespace radix
 {

radixdl/visibility.hh

+#ifndef RADIX_RADIXDL_VISIBILITY_HH_
+#define RADIX_RADIXDL_VISIBILITY_HH_
+// Proxy include to support backward compatability.
+#include "radixcore/visibility.hh"
+#endif /* RADIX_RADIXDL_VISIBILITY_HH_*/

radixgeometry/aabb.hh

@@ -16,7 +16,7 @@
 #include "radixmath/point3d.hh"
 #include "radixmath/ray.hh"
 
-#include "radixdl/visibility.hh"
+#include "radixcore/visibility.hh"
 namespace radix
 {
 /**

radixgeometry/cmake/Dependencies.cmake

 TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
-LIB_REQUIRED_PACKAGES radixmath radixdl radixbug
+LIB_REQUIRED_PACKAGES radixmath radixcore radixbug
 LIB_OPTIONAL_PACKAGES
 TEST_REQUIRED_PACKAGES testframework
 TEST_OPTIONAL_PACKAGES