Skip to content

Commit

Permalink
[CMake] Don't pretend to support MSVC.
Browse files Browse the repository at this point in the history
These might very well be the right things to do, but no one's tested that.

Swift SVN r31537
  • Loading branch information
jrose-apple committed Aug 27, 2015
1 parent 7ec4c4f commit 765fab1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 16 deletions.
4 changes: 2 additions & 2 deletions cmake/modules/AddSwift.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ function(_add_swift_library_single target name)
endif()


if(MSVC_IDE OR XCODE)
if(XCODE)
string(REGEX MATCHALL "/[^/]+" split_path ${CMAKE_CURRENT_SOURCE_DIR})
list(GET split_path -1 dir)
file(GLOB_RECURSE SWIFTLIB_SINGLE_HEADERS
Expand All @@ -773,7 +773,7 @@ function(_add_swift_library_single target name)
source_group("TableGen descriptions" FILES ${SWIFTLIB_SINGLE_TDS})

set(SWIFTLIB_SINGLE_SOURCES ${SWIFTLIB_SINGLE_SOURCES} ${SWIFTLIB_SINGLE_HEADERS} ${SWIFTLIB_SINGLE_TDS})
endif(MSVC_IDE OR XCODE)
endif()

if(MODULE)
set(libkind MODULE)
Expand Down
15 changes: 1 addition & 14 deletions cmake/modules/SwiftSharedCMakeConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,6 @@ macro(swift_common_standalone_build_config product is_cross_compiling)
OBJ_ROOT_DIR llvm_config_obj_root
SOURCE_DIR llvm_config_src_dir
)
if(NOT MSVC_IDE)
set(LLVM_ENABLE_ASSERTIONS ${llvm_config_enable_assertions}
CACHE BOOL "Enable assertions")
# Assertions should follow llvm-config's.
mark_as_advanced(LLVM_ENABLE_ASSERTIONS)
endif()

set(LLVM_TOOLS_BINARY_DIR "${llvm_config_tools_binary_dir}" CACHE PATH "Path to llvm/bin")
set(LLVM_LIBRARY_DIR "${llvm_config_library_dir}" CACHE PATH "Path to llvm/lib")
Expand Down Expand Up @@ -212,13 +206,6 @@ macro(swift_common_standalone_build_config product is_cross_compiling)
get_filename_component(PATH_TO_CLANG_BUILD "${${product}_PATH_TO_CLANG_BUILD}"
ABSOLUTE)

# MSVC has a gazillion warnings with this.
if( MSVC )
set(LLVM_ENABLE_WARNINGS "Enable compiler warnings." OFF)
else( MSVC )
set(LLVM_ENABLE_WARNINGS "Enable compiler warnings." ON)
endif()

set(LLVM_ABI_BREAKING_CHECKS "WITH_ASSERTS")

include(AddLLVM)
Expand Down Expand Up @@ -248,7 +235,7 @@ macro(swift_common_standalone_build_config product is_cross_compiling)
"${PATH_TO_CLANG_BUILD}/${CMAKE_CFG_INTDIR}/lib")

set(LIT_ARGS_DEFAULT "-sv")
if(MSVC OR XCODE)
if(XCODE)
set(LIT_ARGS_DEFAULT "${LIT_ARGS_DEFAULT} --no-progress-bar")
endif()
set(LLVM_LIT_ARGS "${LIT_ARGS_DEFAULT}" CACHE STRING "Default options for lit")
Expand Down

0 comments on commit 765fab1

Please sign in to comment.