Skip to content

Commit

Permalink
cleanup(cmake): delete SelectMSVCRuntime.cmake (#13777)
Browse files Browse the repository at this point in the history
Vcpkg already contains this logic by itself and it might produce wrong results if vcpkg is not being used.
  • Loading branch information
teo-tsirpanis authored Mar 15, 2024
1 parent 93a1e7d commit f3d4abb
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 47 deletions.
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
endif ()

list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
include(SelectMSVCRuntime)

option(GOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK
"If enabled, check that the user has defined OPENSSL_ROOT_DIR on macOS"
Expand Down
3 changes: 0 additions & 3 deletions cmake/GoogleCloudCppCommon.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
# Get the destination directories based on the GNU recommendations.
include(GNUInstallDirs)

# Pick the right MSVC runtime libraries.
include(SelectMSVCRuntime)

# Enable Werror
include(EnableWerror)

Expand Down
38 changes: 0 additions & 38 deletions cmake/SelectMSVCRuntime.cmake

This file was deleted.

3 changes: 0 additions & 3 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ if (NOT GOOGLE_CLOUD_CPP_ENABLE_EXAMPLES)
return()
endif ()

# Pick the right MSVC runtime libraries.
include(SelectMSVCRuntime)

if (bigtable IN_LIST GOOGLE_CLOUD_CPP_ENABLE AND storage IN_LIST
GOOGLE_CLOUD_CPP_ENABLE)
add_executable(gcs2cbt gcs2cbt.cc)
Expand Down
2 changes: 0 additions & 2 deletions external/googleapis/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,6 @@ externalproject_add(

google_cloud_cpp_find_proto_include_dir(PROTO_INCLUDE_DIR)

include(SelectMSVCRuntime)

google_cloud_cpp_add_protos_property()

function (external_googleapis_short_name var proto)
Expand Down

0 comments on commit f3d4abb

Please sign in to comment.