Fix symbol visibility macro use and linker order for static builds.

libdynd · Jul 23, 2017 · 53ac277 · 53ac277
1 parent f6a4555
commit 53ac277
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -510,15 +510,16 @@ else()
         )
 endif()
 
-set_property(
-    TARGET libdyndt
-    PROPERTY COMPILE_DEFINITIONS DYNDT_EXPORT
-)
-
-set_property(
-    TARGET libdynd
-    PROPERTY COMPILE_DEFINITIONS DYND_EXPORT
-)
+if(DYND_SHARED_LIB)
+    set_property(
+        TARGET libdyndt
+        PROPERTY COMPILE_DEFINITIONS DYNDT_EXPORT
+    )
+    set_property(
+        TARGET libdynd
+        PROPERTY COMPILE_DEFINITIONS DYND_EXPORT
+    )
+endif()
 
 # Add preprocessor definitions from CMake
 configure_file("include/dynd/cmake_config.hpp.in"

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -14,4 +14,4 @@ add_executable(simple_example
   simple_example.cpp
 )
 
-target_link_libraries(simple_example libdynd)
+target_link_libraries(simple_example libdynd libdyndt)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -144,7 +144,7 @@ source_group("Types Tests" REGULAR_EXPRESSION "\\/types\\/test_[^\\/]*\\.cpp$")
 source_group("Func Tests" REGULAR_EXPRESSION "\\/func\\/test_[^\\/]*\\.cpp$")
 
 add_executable(test_libdynd ${tests_SRC})
-set(LINK_LIBS ${LINK_LIBS} libdyndt libdynd)
+set(LINK_LIBS ${LINK_LIBS} libdynd libdyndt)
 
 if(DYND_BUILD_PLUGINS)
     set(LINK_LIBS ${LINK_LIBS} dynd_mkl)