diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2021-02-14 11:33:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-14 11:33:47 +0100 |
| commit | cd10468ece8b66199410f274a625a5b05bf36592 (patch) | |
| tree | 9f4ce5953eabd4670ea5b82a0c0baf0bc2c683f8 /src | |
| parent | 32d442ddc69cbc159c75781f33c575ea5b11fc43 (diff) | |
| parent | 5fc8ab2de9f9e44f593e477defdf9b474871a5d2 (diff) | |
| download | PROJ-cd10468ece8b66199410f274a625a5b05bf36592.tar.gz PROJ-cd10468ece8b66199410f274a625a5b05bf36592.zip | |
Merge pull request #2533 from mloskot/ml/cmake-keyword-target-commands
CMake: Prefer keyword signature of target_link_libraries command
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin_cct.cmake | 2 | ||||
| -rw-r--r-- | src/bin_cs2cs.cmake | 2 | ||||
| -rw-r--r-- | src/bin_geod.cmake | 2 | ||||
| -rw-r--r-- | src/bin_geodtest.cmake | 2 | ||||
| -rw-r--r-- | src/bin_gie.cmake | 2 | ||||
| -rw-r--r-- | src/bin_proj.cmake | 2 | ||||
| -rw-r--r-- | src/bin_projinfo.cmake | 2 | ||||
| -rw-r--r-- | src/bin_projsync.cmake | 2 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 12 |
9 files changed, 14 insertions, 14 deletions
diff --git a/src/bin_cct.cmake b/src/bin_cct.cmake index 9e9bb7ec..b36f60de 100644 --- a/src/bin_cct.cmake +++ b/src/bin_cct.cmake @@ -8,7 +8,7 @@ set(CCT_INCLUDE apps/optargpm.h) source_group("Source Files\\Bin" FILES ${CCT_SRC}) add_executable(cct ${CCT_SRC} ${CCT_INCLUDE}) -target_link_libraries(cct ${PROJ_LIBRARIES}) +target_link_libraries(cct PRIVATE ${PROJ_LIBRARIES}) target_compile_options(cct PRIVATE ${PROJ_CXX_WARN_FLAGS}) install(TARGETS cct diff --git a/src/bin_cs2cs.cmake b/src/bin_cs2cs.cmake index 48fc802b..e3d35871 100644 --- a/src/bin_cs2cs.cmake +++ b/src/bin_cs2cs.cmake @@ -7,7 +7,7 @@ set(CS2CS_SRC source_group("Source Files\\Bin" FILES ${CS2CS_SRC}) add_executable(cs2cs ${CS2CS_SRC} ${CS2CS_INCLUDE}) -target_link_libraries(cs2cs ${PROJ_LIBRARIES}) +target_link_libraries(cs2cs PRIVATE ${PROJ_LIBRARIES}) target_compile_options(cs2cs PRIVATE ${PROJ_CXX_WARN_FLAGS}) install(TARGETS cs2cs diff --git a/src/bin_geod.cmake b/src/bin_geod.cmake index c3df5e7a..98dbc4ee 100644 --- a/src/bin_geod.cmake +++ b/src/bin_geod.cmake @@ -9,7 +9,7 @@ set(GEOD_INCLUDE apps/geod_interface.h) source_group("Source Files\\Bin" FILES ${GEOD_SRC} ${GEOD_INCLUDE}) add_executable(geod ${GEOD_SRC} ${GEOD_INCLUDE}) -target_link_libraries(geod ${PROJ_LIBRARIES}) +target_link_libraries(geod PRIVATE ${PROJ_LIBRARIES}) target_compile_options(geod PRIVATE ${PROJ_CXX_WARN_FLAGS}) install(TARGETS geod diff --git a/src/bin_geodtest.cmake b/src/bin_geodtest.cmake index cc155672..ab366144 100644 --- a/src/bin_geodtest.cmake +++ b/src/bin_geodtest.cmake @@ -4,7 +4,7 @@ set(GEODTEST_INCLUDE) source_group("Source Files\\Bin" FILES ${GEODTEST_SRC} ${GEODTEST_INCLUDE}) add_executable(geodtest ${GEODTEST_SRC} ${GEODTEST_INCLUDE}) -target_link_libraries(geodtest ${PROJ_LIBRARIES}) +target_link_libraries(geodtest PRIVATE ${PROJ_LIBRARIES}) target_compile_options(geodtest PRIVATE ${PROJ_CXX_WARN_FLAGS}) # Do not install, instead run as a test diff --git a/src/bin_gie.cmake b/src/bin_gie.cmake index 94a7cea5..5cf9d86d 100644 --- a/src/bin_gie.cmake +++ b/src/bin_gie.cmake @@ -8,7 +8,7 @@ set(GIE_INCLUDE apps/optargpm.h) source_group("Source Files\\Bin" FILES ${GIE_SRC}) add_executable(gie ${GIE_SRC} ${GIE_INCLUDE}) -target_link_libraries(gie ${PROJ_LIBRARIES}) +target_link_libraries(gie PRIVATE ${PROJ_LIBRARIES}) target_compile_options(gie PRIVATE ${PROJ_CXX_WARN_FLAGS}) install(TARGETS gie diff --git a/src/bin_proj.cmake b/src/bin_proj.cmake index 89fd3ff9..d2513386 100644 --- a/src/bin_proj.cmake +++ b/src/bin_proj.cmake @@ -10,7 +10,7 @@ add_executable(binproj ${PROJ_SRC}) set_target_properties(binproj PROPERTIES RUNTIME_OUTPUT_NAME proj) -target_link_libraries(binproj ${PROJ_LIBRARIES}) +target_link_libraries(binproj PRIVATE ${PROJ_LIBRARIES}) target_compile_options(binproj PRIVATE ${PROJ_CXX_WARN_FLAGS}) install(TARGETS binproj diff --git a/src/bin_projinfo.cmake b/src/bin_projinfo.cmake index 8610a3a7..1b8ed637 100644 --- a/src/bin_projinfo.cmake +++ b/src/bin_projinfo.cmake @@ -6,7 +6,7 @@ add_executable(binprojinfo ${PROJINFO_SRC}) set_target_properties(binprojinfo PROPERTIES OUTPUT_NAME projinfo) -target_link_libraries(binprojinfo ${PROJ_LIBRARIES}) +target_link_libraries(binprojinfo PRIVATE ${PROJ_LIBRARIES}) target_compile_options(binprojinfo PRIVATE ${PROJ_CXX_WARN_FLAGS}) install(TARGETS binprojinfo diff --git a/src/bin_projsync.cmake b/src/bin_projsync.cmake index 0e71044f..e18eebd9 100644 --- a/src/bin_projsync.cmake +++ b/src/bin_projsync.cmake @@ -6,7 +6,7 @@ add_executable(bin_projsync ${PROJSYNC_SRC}) set_target_properties(bin_projsync PROPERTIES OUTPUT_NAME projsync) -target_link_libraries(bin_projsync ${PROJ_LIBRARIES}) +target_link_libraries(bin_projsync PRIVATE ${PROJ_LIBRARIES}) target_compile_options(bin_projsync PRIVATE ${PROJ_CXX_WARN_FLAGS}) install(TARGETS bin_projsync RUNTIME DESTINATION ${BINDIR}) diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index 367ff976..2a248a70 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -386,30 +386,30 @@ set(PROJ_LIBRARIES ${PROJ_LIBRARIES} PARENT_SCOPE) if(UNIX) find_library(M_LIB m) if(M_LIB) - target_link_libraries(${PROJ_CORE_TARGET} -lm) + target_link_libraries(${PROJ_CORE_TARGET} PRIVATE -lm) endif() find_library(DL_LIB dl) if(M_LIB) - target_link_libraries(${PROJ_CORE_TARGET} -ldl) + target_link_libraries(${PROJ_CORE_TARGET} PRIVATE -ldl) endif() endif() if(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT) - target_link_libraries(${PROJ_CORE_TARGET} ${CMAKE_THREAD_LIBS_INIT}) + target_link_libraries(${PROJ_CORE_TARGET} PRIVATE ${CMAKE_THREAD_LIBS_INIT}) endif() target_include_directories(${PROJ_CORE_TARGET} PRIVATE ${SQLITE3_INCLUDE_DIR}) -target_link_libraries(${PROJ_CORE_TARGET} ${SQLITE3_LIBRARY}) +target_link_libraries(${PROJ_CORE_TARGET} PRIVATE ${SQLITE3_LIBRARY}) if(TIFF_ENABLED) target_compile_definitions(${PROJ_CORE_TARGET} PRIVATE -DTIFF_ENABLED) target_include_directories(${PROJ_CORE_TARGET} PRIVATE ${TIFF_INCLUDE_DIR}) - target_link_libraries(${PROJ_CORE_TARGET} ${TIFF_LIBRARY}) + target_link_libraries(${PROJ_CORE_TARGET} PRIVATE ${TIFF_LIBRARY}) endif() if(CURL_ENABLED) target_compile_definitions(${PROJ_CORE_TARGET} PRIVATE -DCURL_ENABLED) target_include_directories(${PROJ_CORE_TARGET} PRIVATE ${CURL_INCLUDE_DIR}) - target_link_libraries(${PROJ_CORE_TARGET} ${CURL_LIBRARY}) + target_link_libraries(${PROJ_CORE_TARGET} PRIVATE ${CURL_LIBRARY}) endif() if(MSVC AND BUILD_SHARED_LIBS) |
