diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-10-23 16:17:36 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2021-10-23 16:27:30 +0200 |
| commit | 6e9b324ab7bf5909df7e68409e060282db14fa54 (patch) | |
| tree | 99383710e05b1e0bb046ce086ad522f54d55d5bc /src/bin_geod.cmake | |
| parent | 9817fe7db31d5a0716876e1f8f7f1a9ba4b91be0 (diff) | |
| download | PROJ-6e9b324ab7bf5909df7e68409e060282db14fa54.tar.gz PROJ-6e9b324ab7bf5909df7e68409e060282db14fa54.zip | |
CMake: revise how we deal with symbol export and static builds
- Remove the explicit PROJ_MSVC_DLL_IMPORT symbol used for importing
symbols from a MSVC .dll: by default on MSVC, we use
now __declspec(dllimport), unless PROJ_MSVC_DLL_EXPORT is defined
by PROJ at build time. This makes it easier for users: they
don't have to define anything special. This simplifies in particular
the build of our binaries
- For static builds, export -DPROJ_DLL= as public, so that users
that import PROJ through CMake mechanism don't have to do it
manually.
Diffstat (limited to 'src/bin_geod.cmake')
| -rw-r--r-- | src/bin_geod.cmake | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/bin_geod.cmake b/src/bin_geod.cmake index 3f3f9bf5..6f081634 100644 --- a/src/bin_geod.cmake +++ b/src/bin_geod.cmake @@ -15,10 +15,6 @@ target_compile_options(geod PRIVATE ${PROJ_CXX_WARN_FLAGS}) install(TARGETS geod DESTINATION ${BINDIR}) -if(MSVC AND BUILD_SHARED_LIBS) - target_compile_definitions(geod PRIVATE PROJ_MSVC_DLL_IMPORT=1) -endif() - # invgeod target: symlink or copy of geod executable if(UNIX) @@ -48,8 +44,4 @@ else() install(TARGETS invgeod DESTINATION ${BINDIR}) - if(MSVC AND BUILD_SHARED_LIBS) - target_compile_definitions(invgeod PRIVATE PROJ_MSVC_DLL_IMPORT=1) - endif() - endif() |
