From 3aa9ab7ce6a52f33e4f3403aa58dd6b8f77811ab Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Tue, 7 Feb 2017 23:32:56 +0000 Subject: [CMake] Allow overriding CMAKE_LIBTOOL This patch allows a user to specify a their own libtool instead of auto-detecting one. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@294371 91177308-0d34-0410-b5e6-96231b3b80d8 --- CMakeLists.txt | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index fa7790642b42..df6ef8efedbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,17 +56,20 @@ endif() # This should only apply if you are both on an Apple host, and targeting Apple. if(CMAKE_HOST_APPLE AND APPLE) - if(NOT CMAKE_XCRUN) - find_program(CMAKE_XCRUN NAMES xcrun) - endif() - if(CMAKE_XCRUN) - execute_process(COMMAND ${CMAKE_XCRUN} -find libtool - OUTPUT_VARIABLE CMAKE_LIBTOOL - OUTPUT_STRIP_TRAILING_WHITESPACE) - endif() + # if CMAKE_LIBTOOL is not set, try and find it with xcrun or find_program + if(NOT CMAKE_LIBTOOL) + if(NOT CMAKE_XCRUN) + find_program(CMAKE_XCRUN NAMES xcrun) + endif() + if(CMAKE_XCRUN) + execute_process(COMMAND ${CMAKE_XCRUN} -find libtool + OUTPUT_VARIABLE CMAKE_LIBTOOL + OUTPUT_STRIP_TRAILING_WHITESPACE) + endif() - if(NOT CMAKE_LIBTOOL OR NOT EXISTS CMAKE_LIBTOOL) - find_program(CMAKE_LIBTOOL NAMES libtool) + if(NOT CMAKE_LIBTOOL OR NOT EXISTS CMAKE_LIBTOOL) + find_program(CMAKE_LIBTOOL NAMES libtool) + endif() endif() get_property(languages GLOBAL PROPERTY ENABLED_LANGUAGES) -- cgit v1.2.3