Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CMake: MSVC 64-bit cleanup #11318

Merged
merged 2 commits into from
Nov 20, 2024
Merged

CMake: MSVC 64-bit cleanup #11318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
273c3f1
MSVC 64-bit cleanup
dg0yt Nov 20, 2024
0a5148c
Remove obsolete FindDB2.cmake
dg0yt Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 0 additions & 103 deletions cmake/modules/packages/FindDB2.cmake
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions frmts/gtiff/libtiff/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,6 @@ if (RENAME_INTERNAL_TIFF_SYMBOLS)
target_compile_definitions(libtiff PUBLIC -DRENAME_INTERNAL_LIBTIFF_SYMBOLS)
endif ()

if (MSVC)
if (CMAKE_CL_64)
target_compile_definitions(libtiff PRIVATE -D_WIN64)
endif ()
endif ()

set_target_properties(libtiff PROPERTIES CXX_STANDARD 11)
set_property(TARGET libtiff PROPERTY POSITION_INDEPENDENT_CODE ${GDAL_OBJECT_LIBRARIES_POSITION_INDEPENDENT_CODE})
target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:libtiff>)
3 changes: 0 additions & 3 deletions gdal.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,9 +454,6 @@ target_include_directories(
if (MSVC)
target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE gcore/Version.rc)
source_group("Resource Files" FILES gcore/Version.rc)
if (CMAKE_CL_64)
set_target_properties(${GDAL_LIB_TARGET_NAME} PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
endif ()
endif ()

get_property(_plugins GLOBAL PROPERTY PLUGIN_MODULES)
Expand Down
6 changes: 1 addition & 5 deletions port/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,7 @@ if (GDAL_USE_ODBC)
endif ()
endif ()

if (MSVC)
if (CMAKE_CL_64)
target_compile_definitions(cpl PRIVATE -D_WIN64)
endif ()
else ()
if (NOT MSVC)
if (Threads_FOUND)
gdal_target_link_libraries(cpl PRIVATE Threads::Threads)
endif ()
Expand Down
Loading