Update pcl_exports to handle static build by defining PCL_EXPORTS as empty.

Unify the check for WIN32.

Author: larshg

cmake/pcl_targets.cmake

@@ -232,6 +232,9 @@ function(PCL_ADD_LIBRARY _name)
         DEFINE_SYMBOL "PCLAPI_EXPORTS")
     endif()
 
+    target_compile_definitions(
+      ${_name} PUBLIC "$<IF:$<BOOL:${PCL_SHARED_LIBS}>,PCLAPI_EXPORTS,PCL_STATIC_DEFINE>")
+
     set_target_properties(${_name} PROPERTIES
       VERSION ${PCL_VERSION}
       SOVERSION ${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR})

common/include/pcl/pcl_exports.h

@@ -40,16 +40,20 @@
 // Header 'pcl_macros' is not suitable since it includes <Eigen/Core>,
 // which can't be eaten by nvcc (it's too weak)
 
-#if defined _WIN32 || defined WINCE || defined __MINGW32__
-    #ifdef PCLAPI_EXPORTS
-        #define PCL_EXPORTS __declspec(dllexport)
-    #else
-        #define PCL_EXPORTS __declspec(dllimport)
-    #endif
+#ifdef PCL_STATIC_DEFINE
+  #define PCL_EXPORTS
 #else
-    #ifdef PCL_SYMBOL_VISIBILITY_HIDDEN
-        #define PCL_EXPORTS __attribute__ ((visibility ("default")))
-    #else
-        #define PCL_EXPORTS
-    #endif
+  #if defined WIN32 || defined _WIN32 || defined WINCE || defined __MINGW32__
+      #ifdef PCLAPI_EXPORTS
+          #define PCL_EXPORTS __declspec(dllexport)
+      #else
+          #define PCL_EXPORTS __declspec(dllimport)
+      #endif
+  #else
+      #ifdef PCL_SYMBOL_VISIBILITY_HIDDEN
+          #define PCL_EXPORTS __attribute__ ((visibility ("default")))
+      #else
+          #define PCL_EXPORTS
+      #endif
+  #endif
 #endif

common/include/pcl/pcl_macros.h

@@ -315,18 +315,22 @@ pcl_round (float number)
     #endif
 #endif
 
-#if defined WIN32 || defined _WIN32 || defined WINCE || defined __MINGW32__
-    #ifdef PCLAPI_EXPORTS
-        #define PCL_EXPORTS __declspec(dllexport)
-    #else
-        #define PCL_EXPORTS __declspec(dllimport)
-    #endif
+#ifdef PCL_STATIC_DEFINE
+  #define PCL_EXPORTS
 #else
-    #ifdef PCL_SYMBOL_VISIBILITY_HIDDEN
-        #define PCL_EXPORTS __attribute__ ((visibility ("default")))
-    #else
-        #define PCL_EXPORTS
-    #endif
+  #if defined WIN32 || defined _WIN32 || defined WINCE || defined __MINGW32__
+      #ifdef PCLAPI_EXPORTS
+          #define PCL_EXPORTS __declspec(dllexport)
+      #else
+          #define PCL_EXPORTS __declspec(dllimport)
+      #endif
+  #else
+      #ifdef PCL_SYMBOL_VISIBILITY_HIDDEN
+          #define PCL_EXPORTS __attribute__ ((visibility ("default")))
+      #else
+          #define PCL_EXPORTS
+      #endif
+  #endif
 #endif
 
 #if defined WIN32 || defined _WIN32