Skip to content

Commit

Permalink
CMake: make name of 'gdal' target configurable
Browse files Browse the repository at this point in the history
  • Loading branch information
rouault committed Oct 25, 2021
1 parent 8581a58 commit 583614f
Show file tree
Hide file tree
Showing 40 changed files with 76 additions and 72 deletions.
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ if (POLICY CMP0125)
endif ()
#
project(gdal LANGUAGES C CXX)

set(GDAL_LIB_TARGET_NAME gdal)

#
# setup cmake modules paths
include(cmake/modules/init.cmake)
Expand Down
2 changes: 1 addition & 1 deletion alg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ target_include_directories(
alg PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/marching_squares> $<TARGET_PROPERTY:gdal_GTIFF,SOURCE_DIR>
$<TARGET_PROPERTY:gdal_vrt,SOURCE_DIR> $<TARGET_PROPERTY:gdal_MEM,SOURCE_DIR>)
set_property(TARGET alg PROPERTY POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS})
target_sources(gdal PRIVATE $<TARGET_OBJECTS:alg>)
target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:alg>)
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16)
set_property(SOURCE gdaldither.cpp gdalmediancut.cpp PROPERTY SKIP_UNITY_BUILD_INCLUSION ON)
endif ()
Expand Down
2 changes: 1 addition & 1 deletion alg/internal_libqhull/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ if (MSVC)
endif ()
endif ()

target_sources(gdal PRIVATE $<TARGET_OBJECTS:qhull>)
target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:qhull>)
8 changes: 4 additions & 4 deletions apps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ add_library(
gdalmdiminfo_lib.cpp
gdalmdimtranslate_lib.cpp)
add_dependencies(appslib generate_gdal_version_h)
target_sources(gdal PRIVATE $<TARGET_OBJECTS:appslib>)
target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:appslib>)
gdal_standard_includes(appslib)
target_compile_options(appslib PRIVATE ${GDAL_CXX_WARNING_FLAGS} ${WFLAG_OLD_STYLE_CAST})
target_include_directories(
Expand All @@ -38,7 +38,7 @@ else ()
endif ()

include(TargetPublicHeader)
target_public_header(TARGET gdal HEADERS gdal_utils.h)
target_public_header(TARGET ${GDAL_LIB_TARGET_NAME} HEADERS gdal_utils.h)

if (BUILD_APPS)
# Default Apps
Expand Down Expand Up @@ -136,7 +136,7 @@ if (BUILD_APPS)
target_link_libraries(${UTILCMD} PRIVATE ${JSONC_LIBRARIES})
endif ()
target_include_directories(${UTILCMD} PRIVATE ${PROJ_INCLUDE_DIRS})
target_link_libraries(${UTILCMD} PRIVATE $<TARGET_NAME:gdal>)
target_link_libraries(${UTILCMD} PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}>)
# Windows(Mingw/MSVC) link libraries
if (CMAKE_SYSTEM_NAME MATCHES "Windows")
target_link_libraries(${UTILCMD} PRIVATE wsock32 ws2_32 psapi)
Expand Down Expand Up @@ -189,6 +189,6 @@ if (BUILD_APPS)
target_include_directories(
${UTILCMD} PRIVATE $<TARGET_PROPERTY:gdal_vrt,SOURCE_DIR> $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>
$<TARGET_PROPERTY:ogr_geojson,SOURCE_DIR> $<TARGET_PROPERTY:ogr_MEM,SOURCE_DIR>)
target_link_libraries(${UTILCMD} PRIVATE $<TARGET_NAME:gdal>)
target_link_libraries(${UTILCMD} PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}>)
endforeach ()
endif ()
10 changes: 5 additions & 5 deletions autotest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if (Python_FOUND)
else ()
set(_SEP ":")
endif ()
get_target_property(PLUGIN_OUTPUT_DIR gdal PLUGIN_OUTPUT_DIR)
get_target_property(PLUGIN_OUTPUT_DIR ${GDAL_LIB_TARGET_NAME} PLUGIN_OUTPUT_DIR)
list(APPEND _TEST_ENV "PATH=${CMAKE_BINARY_DIR}/apps${_SEP}$ENV{PATH}" "GDAL_DATA=${CMAKE_SOURCE_DIR}/data"
"GDAL_DRIVER_PATH=${PLUGIN_OUTPUT_DIR}")
if (GDAL_DOWNLOAD_TEST_DATA)
Expand Down Expand Up @@ -67,13 +67,13 @@ if (Python_FOUND)
autotest_${tgt}
COMMAND ${CMAKE_COMMAND} -E env ${PYTHON_RUN_ENV} ${Python_EXECUTABLE} -m pytest -c
${CMAKE_CURRENT_BINARY_DIR}/pytest.ini ${tgt}
DEPENDS gdal gdalapps python_binding)
DEPENDS ${GDAL_LIB_TARGET_NAME} gdalapps python_binding)
endforeach ()
add_custom_target(
autotest
COMMAND ${CMAKE_COMMAND} -E env ${PYTHON_RUN_ENV} ${Python_EXECUTABLE} -m pytest -c
${CMAKE_CURRENT_BINARY_DIR}/pytest.ini
DEPENDS gdal gdalapps python_binding)
DEPENDS ${GDAL_LIB_TARGET_NAME} gdalapps python_binding)
file(
WRITE ${CMAKE_CURRENT_BINARY_DIR}/pytest_runner.cpp
"
Expand Down Expand Up @@ -102,13 +102,13 @@ int main(int argc, char **argv) {
}")
add_executable(pytest_runner ${CMAKE_CURRENT_BINARY_DIR}/pytest_runner.cpp)
set_property(TARGET pytest_runner PROPERTY CXX_STANDARD 11)
target_link_libraries(pytest_runner PUBLIC gdal)
target_link_libraries(pytest_runner PUBLIC ${GDAL_LIB_TARGET_NAME})
target_include_directories(pytest_runner PRIVATE ${Python_INCLUDE_DIRS})
target_link_libraries(pytest_runner PRIVATE ${Python_LIBRARIES})
add_custom_target(
autotest_runner
COMMAND ${CMAKE_COMMAND} -E env ${PYTHON_RUN_ENV} $<TARGET_NAME:pytest_runner> -c
${CMAKE_CURRENT_BINARY_DIR}/pytest.ini
DEPENDS gdal gdalapps python_binding pytest_runner
DEPENDS ${GDAL_LIB_TARGET_NAME} gdalapps python_binding pytest_runner
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
endif ()
14 changes: 7 additions & 7 deletions autotest/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set(GDAL_ROOT_TEST_DIR "${PROJECT_SOURCE_DIR}/autotest")
if (NOT CMAKE_CROSSCOMPILING)
if (LINUX)
add_library(vsipreload MODULE ${PROJECT_SOURCE_DIR}/port/vsipreload.cpp)
target_link_libraries(vsipreload PRIVATE $<TARGET_NAME:gdal>)
target_link_libraries(vsipreload PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}>)
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16)
set_property(SOURCE ${PROJECT_SOURCE_DIR}/port/vsipreload.cpp PROPERTY SKIP_UNITY_BUILD_INCLUSION ON)
endif ()
Expand Down Expand Up @@ -38,8 +38,8 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16)
set_property(TARGET gdal_unit_test PROPERTY UNITY_BUILD OFF)
endif ()

target_link_libraries(gdal_unit_test PRIVATE $<TARGET_NAME:gdal>)
add_dependencies(gdal_unit_test gdal)
target_link_libraries(gdal_unit_test PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}>)
add_dependencies(gdal_unit_test ${GDAL_LIB_TARGET_NAME})
gdal_standard_includes(gdal_unit_test)
target_compile_options(gdal_unit_test PRIVATE ${GDAL_CXX_WARNING_FLAGS})
target_compile_definitions(gdal_unit_test PRIVATE -DGDAL_TEST_ROOT_DIR="${GDAL_ROOT_TEST_DIR}")
Expand All @@ -58,9 +58,9 @@ else ()
set(ENVSEP ":")
endif ()
# FIXME: better handling of output path w/o hard coded. set(GDAL_OUTPUT_DIR
# "$<TARGET_PROPERTY:gdal,LIBRARY_OUTPUT_DIRECTORY>")
# "$<TARGET_PROPERTY:${GDAL_LIB_TARGET_NAME},LIBRARY_OUTPUT_DIRECTORY>")
file(TO_NATIVE_PATH "${PROJECT_BINARY_DIR}" GDAL_OUTPUT_DIR)
# set(GDAL_DRIVER_PATH "$<TARGET_PROPERTY:gdal,PLUGIN_OUTPUT_DIR")
# set(GDAL_DRIVER_PATH "$<TARGET_PROPERTY:${GDAL_LIB_TARGET_NAME},PLUGIN_OUTPUT_DIR")
file(TO_NATIVE_PATH "${PROJECT_BINARY_DIR}/gdalplugins" GDAL_DRIVER_PATH)
file(TO_NATIVE_PATH "${PROJECT_SOURCE_DIR}/data" GDAL_DATA)
# PATH="${GDAL_OUTPUT_DIR}${ENVSEP}$ENV{PATH}"
Expand All @@ -73,12 +73,12 @@ add_custom_target(

macro (gdal_test_target _target _source)
add_executable(${_target} EXCLUDE_FROM_ALL ${_source})
target_link_libraries(${_target} PRIVATE $<TARGET_NAME:gdal>)
target_link_libraries(${_target} PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}>)
gdal_standard_includes(${_target})
target_compile_options(${_target} PRIVATE ${GDAL_CXX_WARNING_FLAGS})
target_include_directories(${_target} PRIVATE $<TARGET_PROPERTY:appslib,SOURCE_DIR>)
target_compile_definitions(${_target} PRIVATE -DGDAL_TEST_ROOT_DIR="${GDAL_ROOT_TEST_DIR}")
add_dependencies(${_target} gdal)
add_dependencies(${_target} ${GDAL_LIB_TARGET_NAME})
endmacro ()

gdal_test_target(testblockcache testblockcache.cpp)
Expand Down
6 changes: 3 additions & 3 deletions cmake/helpers/GdalDriverHelper.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -142,20 +142,20 @@ function(add_gdal_driver)
if (_DRIVER_PLUGIN_BUILD)
# target become *.so *.dll or *.dylib
add_library(${_DRIVER_TARGET} MODULE ${_DRIVER_SOURCES})
get_target_property(PLUGIN_OUTPUT_DIR gdal PLUGIN_OUTPUT_DIR)
get_target_property(PLUGIN_OUTPUT_DIR ${GDAL_LIB_TARGET_NAME} PLUGIN_OUTPUT_DIR)
set_target_properties(${_DRIVER_TARGET}
PROPERTIES
PREFIX ""
LIBRARY_OUTPUT_DIRECTORY ${PLUGIN_OUTPUT_DIR}
)
target_link_libraries(${_DRIVER_TARGET} PRIVATE $<TARGET_NAME:gdal>)
target_link_libraries(${_DRIVER_TARGET} PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}>)
install(FILES $<TARGET_LINKER_FILE:${_DRIVER_TARGET}> DESTINATION ${INSTALL_PLUGIN_DIR}
RENAME "${_DRIVER_TARGET}${CMAKE_SHARED_LIBRARY_SUFFIX}" NAMELINK_SKIP)
set_property(GLOBAL APPEND PROPERTY PLUGIN_MODULES ${_DRIVER_TARGET})
else ()
add_library(${_DRIVER_TARGET} OBJECT ${_DRIVER_SOURCES})
set_property(TARGET ${_DRIVER_TARGET} PROPERTY POSITION_INDEPENDENT_CODE ON)
target_sources(gdal PRIVATE $<TARGET_OBJECTS:${_DRIVER_TARGET}>)
target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:${_DRIVER_TARGET}>)
if (_DRIVER_DEF)
if (IS_OGR EQUAL -1) # raster
target_compile_definitions(gdal_frmts PRIVATE -D${_DRIVER_DEF})
Expand Down
2 changes: 1 addition & 1 deletion cmake/helpers/TargetPublicHeader.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ function(target_public_header)
message(FATAL_ERROR "add_public_header: HEADERS is mandatory argument")
endif()
_convert_to_full_path(FILE_LISTS _PUBLIC_HEADERS)
set_property(TARGET gdal APPEND PROPERTY PUBLIC_HEADER "${FILE_LISTS}")
set_property(TARGET ${GDAL_LIB_TARGET_NAME} APPEND PROPERTY PUBLIC_HEADER "${FILE_LISTS}")
endfunction()
2 changes: 1 addition & 1 deletion frmts/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -165,5 +165,5 @@ endif ()
target_include_directories(
gdal_frmts PRIVATE $<TARGET_PROPERTY:gnm_frmts,SOURCE_DIR> $<TARGET_PROPERTY:gdal_vrt,SOURCE_DIR>
$<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR> $<TARGET_PROPERTY:ogr_MEM,SOURCE_DIR>)
target_sources(gdal PRIVATE $<TARGET_OBJECTS:gdal_frmts>)
target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:gdal_frmts>)
set_property(TARGET gdal_frmts PROPERTY POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS})
4 changes: 2 additions & 2 deletions frmts/envisat/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ target_include_directories(gdal_Envisat PRIVATE ${GDAL_RASTER_FORMAT_SOURCE_DIR}

add_executable(dumpgeo EXCLUDE_FROM_ALL dumpgeo.c EnvisatFile.c EnvisatFile.h)
target_include_directories(dumpgeo PRIVATE $<TARGET_PROPERTY:cpl,SOURCE_DIR>)
target_link_libraries(dumpgeo PRIVATE $<TARGET_NAME:gdal> m dl)
target_link_libraries(dumpgeo PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> m dl)
add_executable(envisat_dump EXCLUDE_FROM_ALL envisat_dump.c EnvisatFile.c EnvisatFile.h)
target_link_libraries(envisat_dump PRIVATE $<TARGET_NAME:gdal> m dl)
target_link_libraries(envisat_dump PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> m dl)
2 changes: 1 addition & 1 deletion frmts/gif/giflib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ add_library(
gif_lib.h
gif_lib_private.h)
set_property(TARGET giflib PROPERTY POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS})
target_sources(gdal PRIVATE $<TARGET_OBJECTS:giflib>)
target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:giflib>)
# target_compile_options(giflib PRIVATE ${GDAL_C_WARNING_FLAGS} ${SOFTWARNFLAGS})
2 changes: 1 addition & 1 deletion frmts/gtiff/libgeotiff/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ set_property(TARGET geotiff PROPERTY POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LI

target_include_directories(geotiff PRIVATE ${PROJ_INCLUDE_DIR})
gdal_add_private_link_libraries(PROJ::PROJ)
target_sources(gdal PRIVATE $<TARGET_OBJECTS:geotiff>)
target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:geotiff>)
2 changes: 1 addition & 1 deletion frmts/gtiff/libtiff/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,4 @@ endif ()

set_target_properties(libtiff PROPERTIES CXX_STANDARD 11)
set_property(TARGET libtiff PROPERTY POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS})
target_sources(gdal PRIVATE $<TARGET_OBJECTS:libtiff>)
target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:libtiff>)
2 changes: 1 addition & 1 deletion frmts/jpeg/libjpeg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ target_compile_options(libjpeg PRIVATE ${GDAL_C_WARNING_FLAGS} ${GDAL_SOFTWARNFL

target_compile_definitions(libjpeg PRIVATE -DDEFAULT_MAX_MEM=500000000L)
set_property(TARGET libjpeg PROPERTY POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS})
target_sources(gdal PRIVATE $<TARGET_OBJECTS:libjpeg>)
target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:libjpeg>)
2 changes: 1 addition & 1 deletion frmts/jpeg/libjpeg12/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ target_compile_definitions(libjpeg12 PRIVATE -DJPEG_DUAL_MODE_8_12)

target_compile_definitions(libjpeg12 PRIVATE -DDEFAULT_MAX_MEM=500000000L)
set_property(TARGET libjpeg12 PROPERTY POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS})
target_sources(gdal PRIVATE $<TARGET_OBJECTS:libjpeg12>)
target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:libjpeg12>)
2 changes: 1 addition & 1 deletion frmts/mrf/LERCV1/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
add_library(liblerc OBJECT Lerc1Image.cpp Lerc1Image.h)
target_include_directories(liblerc PRIVATE $<TARGET_PROPERTY:cpl,SOURCE_DIR> $<TARGET_PROPERTY:cpl,BINARY_DIR>)
set_property(TARGET liblerc PROPERTY POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS})
target_sources(gdal PRIVATE $<TARGET_OBJECTS:liblerc>)
target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:liblerc>)
target_compile_options(liblerc PRIVATE ${GDAL_CXX_WARNING_FLAGS})
2 changes: 1 addition & 1 deletion frmts/pcidsk/sdk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ is_plugin(RES gdal_PCIDSK)
if (RES)
target_sources(gdal_PCIDSK PRIVATE $<TARGET_OBJECTS:pcidsk_sdk>)
else ()
target_sources(gdal PRIVATE $<TARGET_OBJECTS:pcidsk_sdk>)
target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:pcidsk_sdk>)
endif ()

target_include_directories(pcidsk_sdk PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} $<TARGET_PROPERTY:cpl,SOURCE_DIR>
Expand Down
2 changes: 1 addition & 1 deletion frmts/pcraster/libcsf/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,5 @@ is_plugin(RES gdal_PCRaster)
if (RES)
target_sources(gdal_PCRaster PRIVATE $<TARGET_OBJECTS:csf>)
else ()
target_sources(gdal PRIVATE $<TARGET_OBJECTS:csf>)
target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:csf>)
endif ()
2 changes: 1 addition & 1 deletion frmts/png/libpng/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ else ()
gdal_add_private_link_libraries(${ZLIB_LIBRARIES})
endif ()
set_property(TARGET libpng PROPERTY POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS})
target_sources(gdal PRIVATE $<TARGET_OBJECTS:libpng>)
target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:libpng>)
2 changes: 1 addition & 1 deletion frmts/zlib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ add_library(
uncompr.c
zutil.c)
set_property(TARGET libz PROPERTY POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS})
target_sources(gdal PRIVATE $<TARGET_OBJECTS:libz>)
target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:libz>)
target_compile_options(libz PRIVATE ${GDAL_C_WARNING_FLAGS})
if (MSVC)
target_compile_options(libz PRIVATE ${GDAL_SOFTWARNFLAGS} /wd4131)
Expand Down
4 changes: 2 additions & 2 deletions fuzzers/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ enable_testing()

macro (fuzzer_test_target _test _target)
add_executable(${_target} EXCLUDE_FROM_ALL ${_target}.cpp)
target_link_libraries(${_target} PRIVATE $<TARGET_NAME:gdal>)
target_link_libraries(${_target} PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}>)
gdal_standard_includes(${_target})
add_dependencies(${_target} gdal)
add_dependencies(${_target} ${GDAL_LIB_TARGET_NAME})
add_test(NAME ${_test} COMMAND ${_target})
endmacro ()

Expand Down
2 changes: 1 addition & 1 deletion gcore/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ if (HAVE_SSSE3_AT_COMPILE_TIME)
PROPERTY COMPILE_FLAGS ${GDAL_SSSE3_FLAG})
endif ()

target_sources(gdal PRIVATE $<TARGET_OBJECTS:gcore>)
target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:gcore>)

if (GDAL_USE_LIBJSONC_INTERNAL)
target_include_directories(gcore PRIVATE $<TARGET_PROPERTY:libjson,SOURCE_DIR>)
Expand Down
2 changes: 1 addition & 1 deletion gcore/mdreader/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ add_library(
gdal_standard_includes(gcore_mdreader)
add_dependencies(gcore_mdreader generate_gdal_version_h)
target_include_directories(gcore_mdreader PRIVATE $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>)
target_sources(gdal PRIVATE $<TARGET_OBJECTS:gcore_mdreader>)
target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:gcore_mdreader>)
set_property(TARGET gcore_mdreader PROPERTY POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS})
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16)
set_property(SOURCE reader_pleiades.cpp reader_digital_globe.cpp reader_alos.cpp PROPERTY SKIP_UNITY_BUILD_INCLUSION
Expand Down
Loading

0 comments on commit 583614f

Please sign in to comment.