blob: f9bd086caff61b65dc2cc848e1c7b28ffe4390b5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
diff --git a/src/geodesic.h b/src/geodesic.h
index 11484ec7..479a9462 100644
--- a/src/geodesic.h
+++ b/src/geodesic.h
@@ -158,7 +158,7 @@
GEODESIC_VERSION_PATCH)
#ifndef GEOD_DLL
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && defined(PROJ_MSVC_DLL_EXPORT)
#define GEOD_DLL __declspec(dllexport)
#elif defined(__GNUC__)
#define GEOD_DLL __attribute__ ((visibility("default")))
diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake
index bad60324..2e90f98f 100644
--- a/src/lib_proj.cmake
+++ b/src/lib_proj.cmake
@@ -443,7 +443,7 @@ endif()
include_directories(${SQLITE3_INCLUDE_DIR})
target_link_libraries(${PROJ_CORE_TARGET} ${SQLITE3_LIBRARY})
-if(MSVC)
+if(MSVC AND BUILD_LIBPROJ_SHARED)
target_compile_definitions(${PROJ_CORE_TARGET}
PRIVATE PROJ_MSVC_DLL_EXPORT=1)
endif()
|
