diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2013-10-07 01:00:07 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2013-10-07 01:00:07 +0000 |
| commit | 6a971bb8f59f4e20c953a2cc360cab7bae8642e4 (patch) | |
| tree | f3784bd1d13b1987a65df2b1d1a06830e9eeed88 /cmake | |
| parent | 32e3150faba95187c76b211e27d6496a21bee360 (diff) | |
| download | external_llvm-6a971bb8f59f4e20c953a2cc360cab7bae8642e4.zip external_llvm-6a971bb8f59f4e20c953a2cc360cab7bae8642e4.tar.gz external_llvm-6a971bb8f59f4e20c953a2cc360cab7bae8642e4.tar.bz2 | |
Revert "Revert "Windows: Add support for unicode command lines""
This reverts commit r192070 which reverted r192069, I forgot to
regenerate the configure scripts.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192079 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
| -rwxr-xr-x | cmake/config-ix.cmake | 1 | ||||
| -rw-r--r-- | cmake/modules/LLVM-Config.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/TableGen.cmake | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index 57725f8..dc991a2 100755 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -415,6 +415,7 @@ endif () if( MINGW ) set(HAVE_LIBIMAGEHLP 1) set(HAVE_LIBPSAPI 1) + set(HAVE_LIBSHELL32 1) # TODO: Check existence of libraries. # include(CheckLibraryExists) # CHECK_LIBRARY_EXISTS(imagehlp ??? . HAVE_LIBIMAGEHLP) diff --git a/cmake/modules/LLVM-Config.cmake b/cmake/modules/LLVM-Config.cmake index 9fa45ce..e26fabd 100644 --- a/cmake/modules/LLVM-Config.cmake +++ b/cmake/modules/LLVM-Config.cmake @@ -2,7 +2,7 @@ function(get_system_libs return_var) # Returns in `return_var' a list of system libraries used by LLVM. if( NOT MSVC ) if( MINGW ) - set(system_libs ${system_libs} imagehlp psapi) + set(system_libs ${system_libs} imagehlp psapi shell32) elseif( CMAKE_HOST_UNIX ) if( HAVE_LIBRT ) set(system_libs ${system_libs} rt) diff --git a/cmake/modules/TableGen.cmake b/cmake/modules/TableGen.cmake index bbd6339..c17e67e 100644 --- a/cmake/modules/TableGen.cmake +++ b/cmake/modules/TableGen.cmake @@ -128,7 +128,7 @@ macro(add_tablegen target project) endif() if( MINGW ) - target_link_libraries(${target} imagehlp psapi) + target_link_libraries(${target} imagehlp psapi shell32) if(CMAKE_SIZEOF_VOID_P MATCHES "8") set_target_properties(${target} PROPERTIES LINK_FLAGS -Wl,--stack,16777216) endif(CMAKE_SIZEOF_VOID_P MATCHES "8") |