Merge pull request #1 from kwryankrattiger/windows_fixes

Windows fixes

Author: kwryankrattiger

CMakeLists.txt

@@ -9,20 +9,21 @@ else ()
 endif ()
 
 if (APPLE)
-	set(CMAKE_POSITION_INDEPENDENT_CODE False)
+  set(CMAKE_POSITION_INDEPENDENT_CODE FALSE)
 else ()
-	set(CMAKE_POSITION_INDEPENDENT_CODE True)
+  set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 endif ()
 
 project(xmsinterp C CXX)
 
 include(GNUInstallDirs)
+include(GenerateExportHeader)
 
 set(BUILD_SHARED_LIBS OFF CACHE BOOL "Enable/Disable building shared libraries")
 set(BUILD_TESTING NO CACHE BOOL "Enable/Disable testing")
 set(XMS_BUILD_MODE "CONAN" CACHE STRING "Target packing system to build for.")
 set_property(CACHE XMS_BUILD_MODE PROPERTY STRINGS "CONAN;CONDA;CMAKE")
-set(XMS_BUILD NO CACHE BOOL "Set this if you want to use this package with XMS.")
+set(XMS_BUILD ON CACHE BOOL "Set this if you want to use this package with XMS.")
 set(CONDA_PREFIX "" CACHE PATH "Path to the conda environment used to build.")
 set(ENABLE_PYTHON OFF CACHE BOOL "Set this if you want to build the python bindings.")
 set(PYTHON_TARGET_VERSION 3.6 CACHE STRING "Version of python to link to for python wrapping.")
@@ -31,26 +32,42 @@ set(XMS_VERSION "5.2.0" CACHE STRING "Library Version")
 
 add_definitions(-DXMS_VERSION=\"${XMS_VERSION}\")
 
+# Do this because it doesn't work otherwise...
+if (BUILD_SHARED_LIBS AND WIN32)
+  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+endif ()
+
 if (ENABLE_PYTHON AND BUILD_TESTING)
   message(FATAL_ERROR "Cannot build python module when testing is enabled")
 endif ()
 
 if (XMS_BUILD_MODE STREQUAL "CONDA")
   include(${CMAKE_CURRENT_LIST_DIR}/condabuildinfo.cmake)
 elseif (XMS_BUILD_MODE STREQUAL "CMAKE")
+  if (PYTHON_TARGET_VERSION VERSION_LESS 3)
+    message(FATAL_ERROR "XMS requires Python >= 3.0")
+  endif ()
   if (BUILD_SHARED_LIBS)
     set(Boost_USE_STATIC_LIBS OFF)
   else ()
     set(Boost_USE_STATIC_LIBS ON)
   endif ()
+  find_package(ZLIB QUIET REQUIRED)
   find_package(Boost QUIET REQUIRED log_setup log system filesystem serialization timer)
   find_package(XMSCore QUIET REQUIRED
     NAMES xms xmscore)
   find_package(XMSGrid QUIET REQUIRED
     NAMES xms xmsgrid)
-  list(APPEND EXT_INCLUDE_DIRS ${XMSCore_INCLUDE_DIRS};${XMSGrid_INCLUDE_DIRS};${Boost_INCLUDE_DIRS})
+  list(APPEND EXT_INCLUDE_DIRS ${XMSCore_INCLUDE_DIRS};${XMSGrid_INCLUDE_DIRS};${Boost_INCLUDE_DIRS};${ZLIB_INCLUDE_DIRS})
   list(APPEND EXT_LIB_DIRS ${XMSCore_LIBRARY_DIRS};${XMSGrid_LIBRARY_DIRS};${Boost_LIBRARY_DIRS})
-  list(APPEND EXT_LIBS ${XMSCore_LIBRARIES};${XMSGrid_LIBRARIES};${Boost_LIBRARIES};z)
+  list(APPEND EXT_LIBS ${XMSCore_LIBRARIES};${XMSGrid_LIBRARIES};${Boost_LIBRARIES};${ZLIB_LIBRARIES})
+  if (WIN32)
+    if (XMS_BUILD)
+      add_definitions(/Zc:wchar_t)  # Treat wchar_t as built-in type
+      add_definitions(/D _WIN32_WINNT=0x0501)  # Windows XP and higher
+    endif ()
+    add_definitions(/D BOOST_ALL_NO_LIB)
+  endif ()
 else () # If we are not using conda, we are using conan
   # Conan setup
   include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
@@ -60,7 +77,7 @@ else () # If we are not using conda, we are using conan
   list(APPEND EXT_LIBS ${CONAN_LIBS})
 endif ()
 
-if (WIN32)
+if (WIN32 AND XMS_BUILD_MODE STREQUAL "CONAN")
     string(COMPARE EQUAL "${CONAN_SETTINGS_COMPILER_RUNTIME}" "MT" USES_MT)
     if (NOT USES_MT)
         string(COMPARE EQUAL "${CONAN_SETTINGS_COMPILER_RUNTIME}" "MTd" USES_MT)
@@ -100,23 +117,22 @@ if (ENABLE_PYTHON)
         endif ()
 
         find_package(PythonLibsNew ${PYTHON_TARGET_VERSION} EXACT REQUIRED)
+        list(APPEND EXT_INCLUDE_DIRS
+            ${pybind11_INCLUDE_DIR}
+        )
+
+        message("PYTHON_INCLUDE: ${PYTHON_INCLUDE_DIRS}")
+        message("PYTHON_LIBS: ${PYTHON_LIBRARIES}")
+
+        list(APPEND EXT_INCLUDE_DIRS
+          ${PYTHON_INCLUDE_DIRS}
+        )
     else ()
         # New method does not require PythonLibsNew
-        find_package(Python REQUIRED COMPONENTS Interpreter)
-        set(PYTHON_EXECUTABLE ${Python_EXECUTABLE})
+        find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
         find_package(pybind11 CONFIG REQUIRED)
+        list(APPEND EXT_LIBS pybind11::pybind11 Python3::Python)
     endif ()
-
-    list(APPEND EXT_INCLUDE_DIRS
-        ${pybind11_INCLUDE_DIR}
-    )
-
-    message("PYTHON_INCLUDE: ${PYTHON_INCLUDE_DIRS}")
-    message("PYTHON_LIBS: ${PYTHON_LIBRARIES}")
-
-    list(APPEND EXT_INCLUDE_DIRS
-      ${PYTHON_INCLUDE_DIRS}
-    )
 endif ()
 
 include_directories(${CMAKE_CURRENT_LIST_DIR})
@@ -223,14 +239,22 @@ target_link_libraries(${PROJECT_NAME}
 if (UNIX AND NOT APPLE)
     target_link_libraries(${PROJECT_NAME} rt)
 endif ()
+generate_export_header(${PROJECT_NAME} EXPORT_FILE_NAME xmsinterp/xmsinterp_export.h)
+target_include_directories(xmsinterp
+  PUBLIC
+    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+install(FILES ${PROJECT_BINARY_DIR}/xmsinterp/xmsinterp_export.h
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xmsinterp
+  )
 
 if (ENABLE_PYTHON)
     pybind11_add_module(_xmsinterp
       ${xmsinterp_py} ${xmsinterp_py_headers}
     )
     target_include_directories(_xmsinterp
         PRIVATE
-	      ${EXT_LIBS}
+          ${EXT_LIBS}
           ${PYTHON_INCLUDE_DIRS}
     )
     target_link_libraries(_xmsinterp
@@ -241,6 +265,16 @@ if (ENABLE_PYTHON)
     set_target_properties(_xmsinterp PROPERTIES
       LINKER_LANGUAGE CXX
     )
+    generate_export_header(_xmsinterp
+      BASE_NAME xmsinterppy
+      EXPORT_FILE_NAME xmsinterp/python/xmsinterppy_export.h)
+    target_include_directories(_xmsinterp
+      PUBLIC
+        $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+    install(FILES ${PROJECT_BINARY_DIR}/xmsinterp/python/xmsinterppy_export.h
+      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}xmsinterp/python
+      )
 
     if (XMS_BUILD_MODE STREQUAL "CMAKE")
       # Using a standard installation heirarchy for python packages

xmsinterp/interpolate/InterpAnisotropic.h

@@ -7,6 +7,7 @@
 //------------------------------------------------------------------------------
 
 //----- Included files ---------------------------------------------------------
+#include <xmsinterp/xmsinterp_export.h>
 #include <xmscore/misc/base_macros.h>
 #include <xmscore/points/ptsfwd.h>
 #include <xmscore/stl/vector.h>
@@ -28,7 +29,7 @@ class Observer;
 ///        using inverse distance weighted interpolation after scaling the
 ///        transformed x-values.
 /// \see InterpAnisotropicImpl and AnisotropicInterpolator.
-class InterpAnisotropic
+class XMSINTERP_EXPORT InterpAnisotropic
 {
 public:
   static BSHP<InterpAnisotropic> New();

xmsinterp/interpolate/InterpBase.h

@@ -7,6 +7,7 @@
 //------------------------------------------------------------------------------
 
 //----- Included files ---------------------------------------------------------
+#include <xmsinterp/xmsinterp_export.h>
 #include <xmscore/misc/base_macros.h>
 #include <xmscore/misc/boost_defines.h>
 #include <xmscore/misc/DynBitset.h>
@@ -25,7 +26,7 @@ namespace xms
 ////////////////////////////////////////////////////////////////////////////////
 /// \class InterpBase
 /// \brief Base class for interpolation methods.
-class InterpBase
+class XMSINTERP_EXPORT InterpBase
 {
 public:
   /// \cond These are all documented in the implementations
@@ -56,4 +57,4 @@ class InterpBase
   /// \endcond
 };
 //----- Function prototypes ----------------------------------------------------
-}
+}

xmsinterp/interpolate/InterpIdw.h

@@ -8,6 +8,7 @@
 
 //----- Included files ---------------------------------------------------------
 #include <xmscore/misc/base_macros.h>
+#include <xmsinterp/xmsinterp_export.h>
 #include <xmsinterp/interpolate/InterpBase.h>
 #include <xmscore/points/ptsfwd.h>
 #include <xmscore/stl/vector.h>
@@ -25,7 +26,7 @@ class Observer;
 //----- Structs / Classes ------------------------------------------------------
 /// \brief Class that performs inverse distance weighted interpolation
 /// \see InterpIdwImpl
-class InterpIdw : public InterpBase
+class XMSINTERP_EXPORT InterpIdw : public InterpBase
 {
 public:
   static BSHP<InterpIdw> New();

xmsinterp/interpolate/InterpLinear.h

@@ -13,6 +13,7 @@
 // 4. External Library Headers
 
 // 5. Shared Headers
+#include <xmsinterp/xmsinterp_export.h>
 #include <xmscore/points/ptsfwd.h>
 #include <xmscore/stl/vector.h>
 #include <xmsinterp/interpolate/InterpBase.h>
@@ -34,7 +35,7 @@ class Observer;
 ////////////////////////////////////////////////////////////////////////////////
 /// \brief Class that performs linear interpolation
 /// \see InterpLinearImpl
-class InterpLinear : public InterpBase
+class XMSINTERP_EXPORT InterpLinear : public InterpBase
 {
 public:
   static BSHP<InterpLinear> New();

xmsinterp/interpolate/InterpSignals.h

@@ -9,6 +9,7 @@
 //------------------------------------------------------------------------------
 
 //----- Included files ---------------------------------------------------------
+#include <xmsinterp/xmsinterp_export.h>
 #include <boost/signals2.hpp>
 
 //----- Forward declarations ---------------------------------------------------
@@ -21,16 +22,16 @@ namespace xms
 //----- Structs / Classes ------------------------------------------------------
 
 //----- Function prototypes ----------------------------------------------------
-void inSetDataIndex(int val);
-void inFillWtArray(int id, double wt);
+XMSINTERP_EXPORT void inSetDataIndex(int val);
+XMSINTERP_EXPORT void inFillWtArray(int id, double wt);
 
 namespace interp
 {
 namespace connectSet
 {
-boost::signals2::connection SetDataIndex(
+XMSINTERP_EXPORT boost::signals2::connection SetDataIndex(
   const boost::signals2::signal<void(int)>::slot_type& a_slot);
-boost::signals2::connection FillWtArray(
+XMSINTERP_EXPORT boost::signals2::connection FillWtArray(
   const boost::signals2::signal<void(int, double)>::slot_type& a_slot);
 }
 }

xmsinterp/interpolate/InterpUtil.h

@@ -14,6 +14,7 @@
 // 4. External library headers
 
 // 5. Shared code headers
+#include <xmsinterp/xmsinterp_export.h>
 #include <xmscore/points/pt.h>     // for Pt3d
 #include <xmscore/points/ptsfwd.h> // for Pt3d
 #include <xmscore/misc/DynBitset.h>
@@ -31,7 +32,7 @@ namespace xms
 
 //----- Structs / Classes ------------------------------------------------------
 /// \brief Convenience struct used in interpolation utility functions
-struct InterpPtInfo
+struct XMSINTERP_EXPORT InterpPtInfo
 {
 public:
   Pt3d m_loc;      ///< location of interest
@@ -40,28 +41,28 @@ struct InterpPtInfo
 };
 
 //----- Function prototypes ----------------------------------------------------
-void inNodalFuncSetUpMatrixAndVector(double xk,
+XMSINTERP_EXPORT void inNodalFuncSetUpMatrixAndVector(double xk,
                                      double yk,
                                      double fk,
                                      const std::vector<InterpPtInfo>& closest,
                                      double** M,
                                      double* VV);
-void inNodalFuncSetUpMatrixAndVector3d(double xk,
+XMSINTERP_EXPORT void inNodalFuncSetUpMatrixAndVector3d(double xk,
                                        double yk,
                                        double zk,
                                        double fk,
                                        const std::vector<InterpPtInfo>& closest,
                                        double** M,
                                        double* VV);
-void inDistanceSquared(const Pt3d& a_pt,
+XMSINTERP_EXPORT void inDistanceSquared(const Pt3d& a_pt,
                        const std::vector<int>& a_ptIdxs,
                        const std::vector<Pt3d>& a_ptLoc,
                        bool a_2d,
                        std::vector<double>& a_d2);
-void inIdwWeights(const std::vector<double>& a_d2,
+XMSINTERP_EXPORT void inIdwWeights(const std::vector<double>& a_d2,
                   double a_power,
                   bool a_modifiedShepardWeights,
                   std::vector<double>& a_w);
-bool inAllScalarsEqual(const std::vector<float>& a_scalar, const DynBitset& a_act);
+XMSINTERP_EXPORT bool inAllScalarsEqual(const std::vector<float>& a_scalar, const DynBitset& a_act);
 
 } // namespace xms

xmsinterp/interpolate/detail/AnisotropicInterpolator.h

@@ -7,6 +7,7 @@
 //------------------------------------------------------------------------------
 
 //----- Included files ---------------------------------------------------------
+#include <xmsinterp/xmsinterp_export.h>
 #include <xmscore/misc/base_macros.h>
 #include <xmscore/misc/boost_defines.h>
 #include <xmscore/points/ptsfwd.h>
@@ -25,7 +26,7 @@ namespace xms
 
 ////////////////////////////////////////////////////////////////////////////////
 /// \brief Hold data of transforming from xyz to station,normal space
-struct SNResult
+struct XMSINTERP_EXPORT SNResult
 {
   /// \brief Construct a station normal result
   /// \param[in] a_index The index of the centerline segment contain the station
@@ -51,7 +52,7 @@ struct SNResult
 
 ////////////////////////////////////////////////////////////////////////////////
 /// \brief 2D Line definition. If vertical m_slope is Nan.
-struct LineParameters
+struct XMSINTERP_EXPORT LineParameters
 {
   /// \brief Constructor from slope and intercept
   /// \param[in] a_slope The slope. Use kVERTICAL for vertical lines.
@@ -88,7 +89,7 @@ typedef std::vector<SNResult> VecSNResult;
 /// weighting (raised to a power) from the interpolation points will be used to
 /// compute the interpolated z value. This is an internal implementation class
 /// used by InterpAnisotropic.
-class AnisotropicInterpolator
+class XMSINTERP_EXPORT AnisotropicInterpolator
 {
 public:
   AnisotropicInterpolator();

xmsinterp/interpolate/detail/InterpCt.h

@@ -8,6 +8,7 @@
 
 //----- Included files ---------------------------------------------------------
 #include <vector>
+#include <xmsinterp/xmsinterp_export.h>
 #include <xmscore/points/ptsfwd.h>
 #include <xmscore/misc/base_macros.h>
 #include <xmscore/misc/boost_defines.h>
@@ -22,7 +23,7 @@ class NodalFunc;
 //----- Constants / Enumerations -----------------------------------------------
 
 //----- Structs / Classes ------------------------------------------------------
-class InterpCt
+class XMSINTERP_EXPORT InterpCt
 {
 public:
   /// Triangle region enumeration
@@ -52,4 +53,4 @@ class InterpCt
   /// \endcond
 };
 //----- Function prototypes ----------------------------------------------------
-}
+}

xmsinterp/interpolate/detail/InterpNatNeigh.h

@@ -8,6 +8,7 @@
 
 //----- Included files ---------------------------------------------------------
 #include <vector>
+#include <xmsinterp/xmsinterp_export.h>
 #include <xmscore/misc/base_macros.h>
 #include <xmscore/misc/boost_defines.h>
 #include <xmscore/points/ptsfwd.h>
@@ -25,7 +26,7 @@ class GmTriSearch;
 //----- Structs / Classes ------------------------------------------------------
 /// \brief Class that performs natural neighbor interpolation
 /// \see InterpNatNeighImpl
-class InterpNatNeigh
+class XMSINTERP_EXPORT InterpNatNeigh
 {
 public:
   static boost::shared_ptr<InterpNatNeigh> New(const std::vector<Pt3d>& a_pts,
@@ -50,4 +51,4 @@ class InterpNatNeigh
   InterpNatNeigh();
 };
 //----- Function prototypes ----------------------------------------------------
-}
+}