[compiler-rt] r291504 - [cmake] Obtain LLVM_CMAKE_PATH from llvm-config if available

[Rafael Espíndola via llvm-commits]

With this on Windows I am getting errors like:

-- Performing Test COMPILER_RT_HAS_FPIC_FLAG
CMake Error at CMakeLists.txt:2 (set):
  Syntax error in cmake code at

    C:/.....obj/CMakeFiles/CMakeTmp/CMakeLists.txt:2

  when parsing string

    C:/..../compiler-rt/cmake;C:/..../compiler-rt/cmake/Modules;C:\....\lib\cmake\llvm

  Invalid character escape '\s'.

Looks like something should be converting \ to /. Any idea where that
should be done?

Cheers,
Rafael



On 9 January 2017 at 18:23, Michal Gorny via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
> Author: mgorny
> Date: Mon Jan  9 17:23:56 2017
> New Revision: 291504
>
> URL: http://llvm.org/viewvc/llvm-project?rev=291504&view=rev
> Log:
> [cmake] Obtain LLVM_CMAKE_PATH from llvm-config if available
>
> Use the new --cmakedir option to obtain LLVM_CMAKE_PATH straight from
> llvm-config. Fallback to local reconstruction if llvm-config does not
> support this option.
>
> Modified:
>     compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake
>
> Modified: compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake?rev=291504&r1=291503&r2=291504&view=diff
> ==============================================================================
> --- compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake (original)
> +++ compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake Mon Jan  9 17:23:56 2017
> @@ -219,8 +219,18 @@ macro(load_llvm_config)
>    set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree")
>
>    # Make use of LLVM CMake modules.
> -  file(TO_CMAKE_PATH ${LLVM_BINARY_DIR} LLVM_BINARY_DIR_CMAKE_STYLE)
> -  set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR_CMAKE_STYLE}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
> +  # --cmakedir is supported since llvm r291218 (4.0 release)
> +  execute_process(
> +    COMMAND ${LLVM_CONFIG_PATH} --cmakedir
> +    RESULT_VARIABLE HAD_ERROR
> +    OUTPUT_VARIABLE CONFIG_OUTPUT)
> +  if(NOT HAD_ERROR)
> +    string(STRIP "${CONFIG_OUTPUT}" LLVM_CMAKE_PATH)
> +  else()
> +    file(TO_CMAKE_PATH ${LLVM_BINARY_DIR} LLVM_BINARY_DIR_CMAKE_STYLE)
> +    set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR_CMAKE_STYLE}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
> +  endif()
> +
>    list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_PATH}")
>    # Get some LLVM variables from LLVMConfig.
>    include("${LLVM_CMAKE_PATH}/LLVMConfig.cmake")
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits