diff options
| author | Owen Rudge <owen@owenrudge.net> | 2019-12-04 16:34:11 +0000 |
|---|---|---|
| committer | Owen Rudge <owen.rudge@lr.org> | 2019-12-04 16:34:11 +0000 |
| commit | 8ae7e0d2b6e853432ce988fea62527240c529871 (patch) | |
| tree | b9b252df4653359a16b223313f842290efbaa6a4 | |
| parent | 730477ecfea64c215d9799d5546b562930f23892 (diff) | |
| download | PROJ-8ae7e0d2b6e853432ce988fea62527240c529871.tar.gz PROJ-8ae7e0d2b6e853432ce988fea62527240c529871.zip | |
Build: Only export symbols if building DLL
| -rw-r--r-- | src/geodesic.h | 2 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/geodesic.h b/src/geodesic.h index 5d230531..e2265c89 100644 --- a/src/geodesic.h +++ b/src/geodesic.h @@ -158,7 +158,7 @@ GEODESIC_VERSION_PATCH) #if !defined(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 c6a6e111..34c26ed3 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() |