diff options
author | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-02-10 10:52:19 +0000 |
---|---|---|
committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-02-10 10:52:19 +0000 |
commit | fdc6308fa19f4e4fd90b2221eef268945f166e7d (patch) | |
tree | 37b5306c2d253e102ef00f0939523b19531f9d26 | |
parent | 282713c09b592e0d49d3c34e6b3bf62462a17933 (diff) | |
download | llvm-fdc6308fa19f4e4fd90b2221eef268945f166e7d.tar.gz llvm-fdc6308fa19f4e4fd90b2221eef268945f166e7d.tar.bz2 llvm-fdc6308fa19f4e4fd90b2221eef268945f166e7d.tar.xz |
[CMake] LLVMSupport should be responsible to provide system_libs.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201077 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | cmake/modules/AddLLVM.cmake | 5 | ||||
-rw-r--r-- | cmake/modules/TableGen.cmake | 5 | ||||
-rw-r--r-- | lib/Support/CMakeLists.txt | 2 | ||||
-rw-r--r-- | utils/FileCheck/CMakeLists.txt | 6 | ||||
-rw-r--r-- | utils/FileUpdate/CMakeLists.txt | 6 | ||||
-rw-r--r-- | utils/not/CMakeLists.txt | 6 |
6 files changed, 2 insertions, 28 deletions
diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index 83f57a708a..59add8d359 100644 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake @@ -238,10 +238,6 @@ function(llvm_add_library name) llvm_config(${name} ${ARG_LINK_COMPONENTS} ${LLVM_LINK_COMPONENTS}) - # Ensure that the system libraries always comes last on the - # list. Without this, linking the unit tests on MinGW fails. - link_system_libs( ${name} ) - if(LLVM_COMMON_DEPENDS) add_dependencies(${name} ${LLVM_COMMON_DEPENDS}) endif() @@ -330,7 +326,6 @@ macro(add_llvm_executable name) if( LLVM_COMMON_DEPENDS ) add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} ) endif( LLVM_COMMON_DEPENDS ) - link_system_libs( ${name} ) endmacro(add_llvm_executable name) diff --git a/cmake/modules/TableGen.cmake b/cmake/modules/TableGen.cmake index 700affab10..6e52e4d534 100644 --- a/cmake/modules/TableGen.cmake +++ b/cmake/modules/TableGen.cmake @@ -117,15 +117,10 @@ macro(add_tablegen target project) endif() if( MINGW ) - 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") endif( MINGW ) - if( LLVM_ENABLE_THREADS AND HAVE_LIBPTHREAD AND NOT BEOS ) - target_link_libraries(${target} pthread) - endif() - if (${project} STREQUAL LLVM AND NOT LLVM_INSTALL_TOOLCHAIN_ONLY) install(TARGETS ${target} EXPORT LLVMExports diff --git a/lib/Support/CMakeLists.txt b/lib/Support/CMakeLists.txt index a6ebb12e51..5d533dea65 100644 --- a/lib/Support/CMakeLists.txt +++ b/lib/Support/CMakeLists.txt @@ -117,3 +117,5 @@ add_llvm_library(LLVMSupport Windows/TimeValue.inc Windows/Watchdog.inc ) + +link_system_libs(LLVMSupport) diff --git a/utils/FileCheck/CMakeLists.txt b/utils/FileCheck/CMakeLists.txt index d691ceb429..999320f78a 100644 --- a/utils/FileCheck/CMakeLists.txt +++ b/utils/FileCheck/CMakeLists.txt @@ -3,9 +3,3 @@ add_llvm_utility(FileCheck ) target_link_libraries(FileCheck LLVMSupport) -if( MINGW ) - target_link_libraries(FileCheck imagehlp psapi shell32) -endif( MINGW ) -if( LLVM_ENABLE_THREADS AND HAVE_LIBPTHREAD ) - target_link_libraries(FileCheck pthread) -endif() diff --git a/utils/FileUpdate/CMakeLists.txt b/utils/FileUpdate/CMakeLists.txt index 0114e50c62..ce7478f77a 100644 --- a/utils/FileUpdate/CMakeLists.txt +++ b/utils/FileUpdate/CMakeLists.txt @@ -3,9 +3,3 @@ add_llvm_utility(FileUpdate ) target_link_libraries(FileUpdate LLVMSupport) -if( MINGW ) - target_link_libraries(FileUpdate imagehlp psapi shell32) -endif( MINGW ) -if( LLVM_ENABLE_THREADS AND HAVE_LIBPTHREAD ) - target_link_libraries(FileUpdate pthread) -endif() diff --git a/utils/not/CMakeLists.txt b/utils/not/CMakeLists.txt index 5ff14d6692..4a92348ba0 100644 --- a/utils/not/CMakeLists.txt +++ b/utils/not/CMakeLists.txt @@ -3,9 +3,3 @@ add_llvm_utility(not ) target_link_libraries(not LLVMSupport) -if( MINGW ) - target_link_libraries(not imagehlp psapi shell32) -endif( MINGW ) -if( LLVM_ENABLE_THREADS AND HAVE_LIBPTHREAD ) - target_link_libraries(not pthread) -endif() |