[CMake] A few fixups to the Swift CMake package generation

I messed up a few of the variable substitutions. This should get them all correct.

Author: Chris Bieneman

cmake/modules/CMakeLists.txt

@@ -11,7 +11,7 @@ export(TARGETS ${SWIFT_CONFIG_EXPORTS} FILE ${SWIFT_EXPORTS_FILE})
 
 
 set(SWIFT_INCLUDE_DIRS ${SWIFT_INCLUDE_DIR} ${SWIFT_MAIN_INCLUDE_DIR})
-set(SWIFT_LIBRARY_DIRS ${SWIFT_LIBRARY_DIR})
+set(SWIFT_LIBRARY_DIRS ${SWIFT_LIBRARY_OUTPUT_INTDIR})
 
 configure_file(
   SwiftConfig.cmake.in

cmake/modules/SwiftConfig.cmake.in

@@ -3,15 +3,15 @@
 @SWIFT_CONFIG_CODE@
 
 set(SWIFT_VERSION @SWIFT_VERSION@)
-set(SWIFT_MAIN_SRC_DIR @SWIFT_MAIN_SRC_DIR@)
+set(SWIFT_MAIN_SRC_DIR @SWIFT_SOURCE_DIR@)
 
 set(SWIFT_INCLUDE_DIRS "@SWIFT_INCLUDE_DIR@")
 set(SWIFT_LIBRARY_DIRS "@SWIFT_CONFIG_LIBRARY_DIRS@")
 
 # These variables are duplicated, but they must match the LLVM variables of the
 # same name. The variables ending in "S" could some day become lists, and are
 # preserved for convention and compatibility.
-set(SWIFT_INCLUDE_DIR "@SWIFT_INCLUDE_DIR@")
+set(SWIFT_INCLUDE_DIR "@SWIFT_INCLUDE_DIRS@")
 set(SWIFT_LIBRARY_DIR "@SWIFT_CONFIG_LIBRARY_DIRS@")
 
 set(SWIFT_CMAKE_DIR "@SWIFT_CMAKE_DIR@")