| ... | @@ -5,15 +5,15 @@ | ... | @@ -5,15 +5,15 @@ |
| 5 | # LLVM_FOUND | 5 | # LLVM_FOUND |
| 6 | # LLVM_INCLUDE_DIRS | 6 | # LLVM_INCLUDE_DIRS |
| 7 | # LLVM_LIBRARIES | 7 | # LLVM_LIBRARIES |
| 8 | # LLVM_LIBDIR | 8 | # LLVM_LIBDIRS |
| 9 | | 9 | |
| 10 | find_program(LLVM_CONFIG_EXE | 10 | find_program(LLVM_CONFIG_EXE |
| 11 | NAMES llvm-config-8 llvm-config-8.0 llvm-config80 llvm-config | 11 | NAMES llvm-config-8 llvm-config-8.0 llvm-config80 llvm-config |
| 12 | PATHS | 12 | PATHS |
| 13 | "/mingw64/bin" | 13 | "/mingw64/bin" |
| 14 | "/c/msys64/mingw64/bin" | 14 | "/c/msys64/mingw64/bin" |
| 15 | "c:/msys64/mingw64/bin" | 15 | "c:/msys64/mingw64/bin" |
| 16 | "C:/Libraries/llvm-8.0.0/bin") | 16 | "C:/Libraries/llvm-8.0.0/bin") |
| 17 | | 17 | |
| 18 | if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND") | 18 | if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND") |
| 19 | message(FATAL_ERROR "unable to find llvm-config") | 19 | message(FATAL_ERROR "unable to find llvm-config") |
| ... | @@ -24,9 +24,9 @@ if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND") | ... | @@ -24,9 +24,9 @@ if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND") |
| 24 | endif() | 24 | endif() |
| 25 | | 25 | |
| 26 | execute_process( | 26 | execute_process( |
| 27 | COMMAND ${LLVM_CONFIG_EXE} --version | 27 | COMMAND ${LLVM_CONFIG_EXE} --version |
| 28 | OUTPUT_VARIABLE LLVM_CONFIG_VERSION | 28 | OUTPUT_VARIABLE LLVM_CONFIG_VERSION |
| 29 | OUTPUT_STRIP_TRAILING_WHITESPACE) | 29 | OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 30 | | 30 | |
| 31 | if("${LLVM_CONFIG_VERSION}" VERSION_LESS 8) | 31 | if("${LLVM_CONFIG_VERSION}" VERSION_LESS 8) |
| 32 | message(FATAL_ERROR "expected LLVM 8.x but found ${LLVM_CONFIG_VERSION}") | 32 | message(FATAL_ERROR "expected LLVM 8.x but found ${LLVM_CONFIG_VERSION}") |
| ... | @@ -39,15 +39,15 @@ if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 9) | ... | @@ -39,15 +39,15 @@ if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 9) |
| 39 | endif() | 39 | endif() |
| 40 | | 40 | |
| 41 | execute_process( | 41 | execute_process( |
| 42 | COMMAND ${LLVM_CONFIG_EXE} --targets-built | 42 | COMMAND ${LLVM_CONFIG_EXE} --targets-built |
| 43 | OUTPUT_VARIABLE LLVM_TARGETS_BUILT_SPACES | 43 | OUTPUT_VARIABLE LLVM_TARGETS_BUILT_SPACES |
| 44 | OUTPUT_STRIP_TRAILING_WHITESPACE) | 44 | OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 45 | string(REPLACE " " ";" LLVM_TARGETS_BUILT "${LLVM_TARGETS_BUILT_SPACES}") | 45 | string(REPLACE " " ";" LLVM_TARGETS_BUILT "${LLVM_TARGETS_BUILT_SPACES}") |
| 46 | function(NEED_TARGET TARGET_NAME) | 46 | function(NEED_TARGET TARGET_NAME) |
| 47 | list (FIND LLVM_TARGETS_BUILT "${TARGET_NAME}" _index) | 47 | list (FIND LLVM_TARGETS_BUILT "${TARGET_NAME}" _index) |
| 48 | if (${_index} EQUAL -1) | 48 | if (${_index} EQUAL -1) |
| 49 | message(FATAL_ERROR "LLVM is missing target ${TARGET_NAME}. Zig requires LLVM to be built with all default targets enabled.") | 49 | message(FATAL_ERROR "LLVM is missing target ${TARGET_NAME}. Zig requires LLVM to be built with all default targets enabled.") |
| 50 | endif() | 50 | endif() |
| 51 | endfunction(NEED_TARGET) | 51 | endfunction(NEED_TARGET) |
| 52 | NEED_TARGET("AArch64") | 52 | NEED_TARGET("AArch64") |
| 53 | NEED_TARGET("AMDGPU") | 53 | NEED_TARGET("AMDGPU") |
| ... | @@ -67,53 +67,47 @@ NEED_TARGET("XCore") | ... | @@ -67,53 +67,47 @@ NEED_TARGET("XCore") |
| 67 | | 67 | |
| 68 | if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug") OR ZIG_STATIC) | 68 | if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug") OR ZIG_STATIC) |
| 69 | execute_process( | 69 | execute_process( |
| 70 | COMMAND ${LLVM_CONFIG_EXE} --libdir --link-static | 70 | COMMAND ${LLVM_CONFIG_EXE} --libfiles --link-static |
| 71 | OUTPUT_VARIABLE LLVM_LIBDIR_ORIG | 71 | OUTPUT_VARIABLE LLVM_LIBRARIES_SPACES |
| 72 | OUTPUT_STRIP_TRAILING_WHITESPACE) | 72 | OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 73 | file(TO_CMAKE_PATH "${LLVM_LIBDIR_ORIG}" LLVM_LIBDIR) | 73 | string(REPLACE " " ";" LLVM_LIBRARIES "${LLVM_LIBRARIES_SPACES}") |
| 74 | | 74 | |
| 75 | execute_process( | 75 | execute_process( |
| 76 | COMMAND ${LLVM_CONFIG_EXE} --libnames --link-static | 76 | COMMAND ${LLVM_CONFIG_EXE} --system-libs --link-static |
| 77 | OUTPUT_VARIABLE LLVM_LIBNAMES_SPACES | 77 | OUTPUT_VARIABLE LLVM_SYSTEM_LIBS_SPACES |
| 78 | OUTPUT_STRIP_TRAILING_WHITESPACE) | 78 | OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 79 | string(REPLACE " " ";" LLVM_LIBNAMES "${LLVM_LIBNAMES_SPACES}") | 79 | string(REPLACE " " ";" LLVM_SYSTEM_LIBS "${LLVM_SYSTEM_LIBS_SPACES}") |
| 80 | foreach(LLVM_LIBNAME ${LLVM_LIBNAMES}) | | |
| 81 | list(APPEND LLVM_LIBRARIES "${LLVM_LIBDIR}/${LLVM_LIBNAME}") | | |
| 82 | endforeach() | | |
| 83 | | 80 | |
| 84 | execute_process( | 81 | execute_process( |
| 85 | COMMAND ${LLVM_CONFIG_EXE} --system-libs --link-static | 82 | COMMAND ${LLVM_CONFIG_EXE} --libdir --link-static |
| 86 | OUTPUT_VARIABLE LLVM_SYSTEM_LIBS_SPACES | 83 | OUTPUT_VARIABLE LLVM_LIBDIRS_SPACES |
| 87 | OUTPUT_STRIP_TRAILING_WHITESPACE) | 84 | OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 88 | string(REPLACE " " ";" LLVM_SYSTEM_LIBS "${LLVM_SYSTEM_LIBS_SPACES}") | 85 | string(REPLACE " " ";" LLVM_LIBDIRS "${LLVM_LIBDIRS_SPACES}") |
| 89 | endif() | 86 | endif() |
| 90 | if(NOT LLVM_LIBRARIES) | 87 | if(NOT LLVM_LIBRARIES) |
| 91 | execute_process( | 88 | execute_process( |
| 92 | COMMAND ${LLVM_CONFIG_EXE} --libdir | 89 | COMMAND ${LLVM_CONFIG_EXE} --libs |
| 93 | OUTPUT_VARIABLE LLVM_LIBDIR_ORIG | 90 | OUTPUT_VARIABLE LLVM_LIBRARIES_SPACES |
| 94 | OUTPUT_STRIP_TRAILING_WHITESPACE) | 91 | OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 95 | file(TO_CMAKE_PATH "${LLVM_LIBDIR_ORIG}" LLVM_LIBDIR) | 92 | string(REPLACE " " ";" LLVM_LIBRARIES "${LLVM_LIBRARIES_SPACES}") |
| 96 | | 93 | |
| 97 | execute_process( | 94 | execute_process( |
| 98 | COMMAND ${LLVM_CONFIG_EXE} --libs | 95 | COMMAND ${LLVM_CONFIG_EXE} --system-libs |
| 99 | OUTPUT_VARIABLE LLVM_LIBNAMES_SPACES | 96 | OUTPUT_VARIABLE LLVM_SYSTEM_LIBS_SPACES |
| 100 | OUTPUT_STRIP_TRAILING_WHITESPACE) | 97 | OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 101 | string(REPLACE " " ";" LLVM_LIBNAMES "${LLVM_LIBNAMES_SPACES}") | 98 | string(REPLACE " " ";" LLVM_SYSTEM_LIBS "${LLVM_SYSTEM_LIBS_SPACES}") |
| 102 | foreach(LLVM_LIBNAME ${LLVM_LIBNAMES}) | | |
| 103 | list(APPEND LLVM_LIBRARIES "${LLVM_LIBDIR}/${LLVM_LIBNAME}") | | |
| 104 | endforeach() | | |
| 105 | | 99 | |
| 106 | execute_process( | 100 | execute_process( |
| 107 | COMMAND ${LLVM_CONFIG_EXE} --system-libs | 101 | COMMAND ${LLVM_CONFIG_EXE} --libdir |
| 108 | OUTPUT_VARIABLE LLVM_SYSTEM_LIBS_SPACES | 102 | OUTPUT_VARIABLE LLVM_LIBDIRS_SPACES |
| 109 | OUTPUT_STRIP_TRAILING_WHITESPACE) | 103 | OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 110 | string(REPLACE " " ";" LLVM_SYSTEM_LIBS "${LLVM_SYSTEM_LIBS_SPACES}") | 104 | string(REPLACE " " ";" LLVM_LIBDIRS "${LLVM_LIBDIRS_SPACES}") |
| 111 | endif() | 105 | endif() |
| 112 | | 106 | |
| 113 | execute_process( | 107 | execute_process( |
| 114 | COMMAND ${LLVM_CONFIG_EXE} --includedir | 108 | COMMAND ${LLVM_CONFIG_EXE} --includedir |
| 115 | OUTPUT_VARIABLE LLVM_INCLUDE_DIRS | 109 | OUTPUT_VARIABLE LLVM_INCLUDE_DIRS |
| 116 | OUTPUT_STRIP_TRAILING_WHITESPACE) | 110 | OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 117 | | 111 | |
| 118 | set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS}) | 112 | set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS}) |
| 119 | | 113 | |
| ... | @@ -122,9 +116,9 @@ if(NOT LLVM_LIBRARIES) | ... | @@ -122,9 +116,9 @@ if(NOT LLVM_LIBRARIES) |
| 122 | endif() | 116 | endif() |
| 123 | | 117 | |
| 124 | link_directories("${CMAKE_PREFIX_PATH}/lib") | 118 | link_directories("${CMAKE_PREFIX_PATH}/lib") |
| 125 | link_directories("${LLVM_LIBDIR}") | 119 | link_directories("${LLVM_LIBDIRS}") |
| 126 | | 120 | |
| 127 | include(FindPackageHandleStandardArgs) | 121 | include(FindPackageHandleStandardArgs) |
| 128 | find_package_handle_standard_args(LLVM DEFAULT_MSG LLVM_LIBRARIES LLVM_INCLUDE_DIRS) | 122 | find_package_handle_standard_args(LLVM DEFAULT_MSG LLVM_LIBRARIES LLVM_INCLUDE_DIRS) |
| 129 | | 123 | |
| 130 | mark_as_advanced(LLVM_INCLUDE_DIRS LLVM_LIBRARIES LLVM_LIBDIR) | 124 | mark_as_advanced(LLVM_INCLUDE_DIRS LLVM_LIBRARIES LLVM_LIBDIRS) |
Andrew Kelley <andrew@ziglang.org> 2019-07-09 13:31:13-04:00
Commit is signed but in an unrecognized format.
cmake