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 /test | |
| 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 'test')
| -rw-r--r-- | test/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | test/unit/CMakeLists.txt | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a7aac755..637da9e2 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -51,7 +51,6 @@ proj_add_gie_test("GIGS-5208" "gigs/5208.gie") #SET(TEST_MAIN_SRC test_main.cpp) #set(TEST_MAIN_LIBRARIES test_main) #add_library( ${TEST_MAIN_LIBRARIES} -# ${PROJ_LIBRARY_TYPE} # ${TEST_MAIN_SRC} # ${CATCH2_INCLUDE} ) diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index 845d07e5..2d460756 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -51,7 +51,7 @@ endif() # USE_EXTERNAL_GTEST # Build PROJ unit tests # -if("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC" AND BUILD_LIBPROJ_SHARED) +if(MSVC AND BUILD_SHARED_LIBS) add_definitions(-DPROJ_MSVC_DLL_IMPORT=1) endif() @@ -104,7 +104,7 @@ add_test(NAME proj_context_test COMMAND proj_context_test) set_property(TEST proj_context_test PROPERTY ENVIRONMENT "PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES;PROJ_LIB=${PROJECT_BINARY_DIR}/data/for_tests") -if(MSVC AND BUILD_LIBPROJ_SHARED) +if(MSVC AND BUILD_SHARED_LIBS) # ph_phi2_test not compatible of a .dll build else() add_executable(pj_phi2_test |