diff options
| author | Mike Taves <mwtoews@gmail.com> | 2020-02-21 15:40:35 +1300 |
|---|---|---|
| committer | Mike Taves <mwtoews@gmail.com> | 2020-02-21 22:43:30 +1300 |
| commit | 2336ac77b53068b7a7d5618764a13a52c428a332 (patch) | |
| tree | 95874f52248d1d41a89a1d26bb0a3677f4376199 /src/lib_proj.cmake | |
| parent | 86530f3146ec091c26652e60067088dc3e067fae (diff) | |
| download | PROJ-2336ac77b53068b7a7d5618764a13a52c428a332.tar.gz PROJ-2336ac77b53068b7a7d5618764a13a52c428a332.zip | |
CMake: rename BUILD_LIBPROJ_SHARED to BUILD_SHARED_LIBS
* Deprecate BUILD_LIBPROJ_SHARED, but still use it as an alias for now
* Rename BUILD_LIBPROJ_SHARED_DEFAULT to BUILD_SHARED_LIBS_DEFAULT
* Keep previous defaults (UNIX as shared and Windows as static)
* Remove PROJ_LIBRARY_TYPE, since add_library() uses BUILD_SHARED_LIBS
Diffstat (limited to 'src/lib_proj.cmake')
| -rw-r--r-- | src/lib_proj.cmake | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index 9200baba..be8bc4db 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -4,21 +4,20 @@ message(STATUS "Configuring proj library:") ### SWITCH BETWEEN STATIC OR SHARED LIBRARY### ############################################## -# default config, shared on unix and static on Windows -if(UNIX) - set(BUILD_LIBPROJ_SHARED_DEFAULT ON) +# Support older option, to be removed by PROJ 8.0 +if(DEFINED BUILD_LIBPROJ_SHARED) + message(DEPRECATION + "BUILD_LIBPROJ_SHARED has been replaced with BUILD_SHARED_LIBS") + set(BUILD_SHARED_LIBS ${BUILD_LIBPROJ_SHARED}) endif() + +# default config is shared, except static on Windows +set(BUILD_SHARED_LIBS_DEFAULT ON) if(WIN32) - set(BUILD_LIBPROJ_SHARED_DEFAULT OFF) + set(BUILD_SHARED_LIBS_DEFAULT OFF) endif() -option(BUILD_LIBPROJ_SHARED - "Build libproj library shared." ${BUILD_LIBPROJ_SHARED_DEFAULT}) -if(BUILD_LIBPROJ_SHARED) - set(PROJ_LIBRARY_TYPE SHARED) -else() - set(PROJ_LIBRARY_TYPE STATIC) -endif() - +option(BUILD_SHARED_LIBS + "Build PROJ library shared." ${BUILD_SHARED_LIBS_DEFAULT}) option(USE_THREAD "Build libproj with thread/mutex support " ON) if(NOT USE_THREAD) @@ -321,7 +320,6 @@ proj_target_output_name(${PROJ_CORE_TARGET} PROJ_CORE_TARGET_OUTPUT_NAME) add_library( ${PROJ_CORE_TARGET} - ${PROJ_LIBRARY_TYPE} ${ALL_LIBPROJ_SOURCES} ${ALL_LIBPROJ_HEADERS} ${PROJ_RESOURCES} @@ -416,7 +414,7 @@ if(CURL_FOUND) target_link_libraries(${PROJ_CORE_TARGET} ${CURL_LIBRARY}) endif() -if(MSVC AND BUILD_LIBPROJ_SHARED) +if(MSVC AND BUILD_SHARED_LIBS) target_compile_definitions(${PROJ_CORE_TARGET} PRIVATE PROJ_MSVC_DLL_EXPORT=1) endif() @@ -441,5 +439,5 @@ endif() ############################################## print_variable(PROJ_CORE_TARGET) print_variable(PROJ_CORE_TARGET_OUTPUT_NAME) -print_variable(PROJ_LIBRARY_TYPE) +print_variable(BUILD_SHARED_LIBS) print_variable(PROJ_LIBRARIES) |