diff options
| author | Mike Taves <mwtoews@gmail.com> | 2020-02-22 13:35:36 +1300 |
|---|---|---|
| committer | Mike Taves <mwtoews@gmail.com> | 2020-02-22 13:44:59 +1300 |
| commit | ec4c66f40d84eda65b37437fba5be0b2efe70c85 (patch) | |
| tree | 0dacc49ebb395957e724cdac83652150483d142a /test | |
| parent | f0ecf2709d759afee1946722f8b0da37e38b04a9 (diff) | |
| download | PROJ-ec4c66f40d84eda65b37437fba5be0b2efe70c85.tar.gz PROJ-ec4c66f40d84eda65b37437fba5be0b2efe70c85.zip | |
Merge pull request #1962 from mwtoews/shared
CMake: rename BUILD_LIBPROJ_SHARED to 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 |