Merge pull request #104 from LLNL/fix-windows-shared

fix build and install of windows DLLs

Author: trws

CMakeLists.txt

@@ -106,6 +106,15 @@ blt_add_library (
   SOURCES ./src/errors.cpp
   DEPENDS_ON ${camp_depends}
   )
+
+if (COMPILER_FAMILY_IS_MSVC)
+  if (NOT BUILD_SHARED_LIBS)
+    target_compile_definitions(camp PUBLIC WIN_STATIC_BUILD)
+  else (NOT BUILD_SHARED_LIBS)
+    target_compile_definitions(camp PRIVATE CAMP_DLL_EXPORTS)
+  endif (NOT BUILD_SHARED_LIBS)
+endif ()
+
 target_include_directories (camp PUBLIC
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
@@ -123,14 +132,12 @@ write_basic_package_version_file(
   COMPATIBILITY AnyNewerVersion
   )
 
-install(TARGETS camp
+install(TARGETS
+  camp
   EXPORT campTargets
-  LIBRARY DESTINATION lib COMPONENT Runtime
-  ARCHIVE DESTINATION lib COMPONENT Development
-  RUNTIME DESTINATION bin COMPONENT Runtime
-  PUBLIC_HEADER DESTINATION include COMPONENT Development
-  BUNDLE DESTINATION bin COMPONENT Runtime
-  )
+  RUNTIME DESTINATION lib
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib)
 
 include(CMakePackageConfigHelpers)
 configure_package_config_file(

include/camp/config.in.hpp

@@ -14,3 +14,13 @@
 #define CAMP_VERSION (CAMP_VERSION_MAJOR * 1000000) \
                     +(CAMP_VERSION_MINOR * 1000) \
                     +(CAMP_VERSION_PATCH)
+
+#if (defined(_WIN32) || defined(_WIN64)) && !defined(CAMP_WIN_STATIC_BUILD)
+#ifdef CAMP_DLL_EXPORTS
+#define CAMP_DLL_EXPORT __declspec(dllexport)
+#else
+#define CAMP_DLL_EXPORT __declspec(dllimport)
+#endif
+#else
+#define CAMP_DLL_EXPORT
+#endif

include/camp/defines.hpp

@@ -177,13 +177,13 @@ using nullptr_t = decltype(nullptr);
   }
 
 /// Throw a runtime_error, avoid including exception everywhere
-void throw_re(const char *s);
+CAMP_DLL_EXPORT void throw_re(const char *s);
 
 #ifdef CAMP_ENABLE_CUDA
 
 #define campCudaErrchk(ans) ::camp::cudaAssert((ans), #ans, __FILE__, __LINE__)
 
-cudaError_t cudaAssert(cudaError_t code,
+CAMP_DLL_EXPORT cudaError_t cudaAssert(cudaError_t code,
                               const char *call,
                               const char *file,
                               int line);
@@ -195,7 +195,7 @@ cudaError_t cudaAssert(cudaError_t code,
 
 #define campHipErrchk(ans) ::camp::hipAssert((ans), #ans, __FILE__, __LINE__)
 
-hipError_t hipAssert(hipError_t code,
+CAMP_DLL_EXPORT hipError_t hipAssert(hipError_t code,
                             const char *call,
                             const char *file,
                             int line);