Merge pull request swiftlang#1431 from practicalswift/cmake-fixes

[CMakeLists] Remove unused SWIFT_INCLUDE_OUTPUT_INTDIR + comment out unnecessary logic

Author: gribozavr

CMakeLists.txt

@@ -304,7 +304,6 @@ set(SWIFT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 
 set(SWIFT_RUNTIME_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin")
 set(SWIFT_LIBRARY_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib")
-set(SWIFT_INCLUDE_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/include")
 if("${SWIFT_NATIVE_SWIFT_TOOLS_PATH}" STREQUAL "")
   set(SWIFT_NATIVE_SWIFT_TOOLS_PATH "${SWIFT_RUNTIME_OUTPUT_INTDIR}")
 endif()

utils/CMakeLists.txt

@@ -1,9 +1,5 @@
 add_subdirectory(vim)
 
-if(SWIFT_INSTALL_TOOLS)
-  # FIXME: install gyb.
-endif()
-
 swift_install_in_component(editor-integration
     FILES swift-mode.el
     DESTINATION "share/emacs/site-lisp")