Support for static building into Windows. Fix visibility for that

j-rivero · Oct 11, 2017 · e509a3d · e509a3d
1 parent 3fb1525
commit e509a3d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/include/fcl/common/visibility.h b/include/fcl/common/visibility.h
@@ -24,20 +24,25 @@
  */
 
 #if defined _WIN32 || defined __CYGWIN__
-  #ifdef BUILDING_DLL
-    #ifdef __GNUC__
-      #define FCL_VISIBLE __attribute__ ((dllexport))
-    #else
-      #define FCL_VISIBLE __declspec(dllexport)
-    #endif
+  #ifdef FCL_STATIC_LIBRARY
+    #define FCL_VISIBLE
+    #define FCL_HIDDEN
   #else
-    #ifdef __GNUC__
-      #define FCL_VISIBLE __attribute__ ((dllimport))
+    #ifdef FCL_EXPORTS
+      #ifdef __GNUC__
+        #define FCL_VISIBLE __attribute__ ((dllexport))
+      #else
+        #define FCL_VISIBLE __declspec(dllexport)
+      #endif
     #else
-      #define FCL_VISIBLE __declspec(dllimport)
+      #ifdef __GNUC__
+        #define FCL_VISIBLE __attribute__ ((dllimport))
+      #else
+        #define FCL_VISIBLE __declspec(dllimport)
+      #endif
     #endif
+    #define FCL_HIDDEN
   #endif
-  #define FCL_HIDDEN
 #else
   #ifdef FCL_HIDE_ALL_SYMBOLS
     #define FCL_VISIBLE __attribute__ ((visibility ("hidden")))

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -3,6 +3,9 @@ if(FCL_STATIC_LIBRARY)
   add_library(${PROJECT_NAME} STATIC ${FCL_HEADERS} ${FCL_SOURCE_CODE})
 else()
   add_library(${PROJECT_NAME} SHARED ${FCL_HEADERS} ${FCL_SOURCE_CODE})
+  set_target_properties(${PROJECT_NAME} PROPERTIES
+      COMPILE_DEFINITIONS FCL_EXPORTS
+      DEFINE_SYMBOL FCL_EXPORTS)
 endif()
 
 # Be sure to pass to the consumer the set of SIMD used in the compilation