This is an archive of the discontinued LLVM Phabricator instance.

Differential D53479

[Cmake] Allowed OpenMP testing detect test compiler with same generator
ClosedPublic

Authored by SquallATF on Oct 21 2018, 7:32 AM.

Details

Reviewers
jlpeyton
Commits
rG1c268554bacc: [OpenMP][Cmake] Allowed OpenMP testing detect test compiler with same generator
rL351223: [OpenMP][Cmake] Allowed OpenMP testing detect test compiler with same generator
rOMP351223: [OpenMP][Cmake] Allowed OpenMP testing detect test compiler with same generator
Summary

fix ninja build detect test compiler failed under windows.

Diff Detail

Event Timeline

SquallATF created this revision.Oct 21 2018, 7:32 AM
Herald added subscribers: openmp-commits, guansong, mgorny. · View Herald TranscriptOct 21 2018, 7:32 AM
Harbormaster completed remote builds in B23975: Diff 170335.Oct 21 2018, 7:32 AM
SquallATF added a child revision: D53422: Support clang compiling under windows-gnu and windows-msvc.Oct 21 2018, 7:36 AM
SquallATF retitled this revision from [Cmake] Allowed OpenMP testing with same generator to [Cmake] Allowed OpenMP testing detect test compiler with same generator.Oct 21 2018, 6:34 PM
SquallATF edited the summary of this revision. (Show Details)
AndreyChurbanov added a reviewer: jlpeyton.Nov 9 2018, 5:52 AM
jlpeyton accepted this revision.Nov 9 2018, 8:54 AM

LGTM

This revision is now accepted and ready to land.Nov 9 2018, 8:54 AM
Closed by commit rOMP351223: [OpenMP][Cmake] Allowed OpenMP testing detect test compiler with same generator (authored by jlpeyton). · Explain WhyJan 15 2019, 11:12 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
cmake/
2 lines

Diff 170335

cmake/OpenMPTesting.cmake

Show First 20 Lines • Show All 93 Lines • ▼ Show 20 Lines
endfunction() endfunction()
if (${OPENMP_STANDALONE_BUILD}) if (${OPENMP_STANDALONE_BUILD})
# Detect compiler that should be used for testing. # Detect compiler that should be used for testing.
# We cannot use ExternalProject_Add() because its configuration runs when this # We cannot use ExternalProject_Add() because its configuration runs when this
# project is built which is too late for detecting the compiler... # project is built which is too late for detecting the compiler...
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DetectTestCompiler) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DetectTestCompiler)
execute_process( execute_process(
COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_LIST_DIR}/DetectTestCompiler COMMAND ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} ${CMAKE_CURRENT_LIST_DIR}/DetectTestCompiler
-DCMAKE_C_COMPILER=${OPENMP_TEST_C_COMPILER} -DCMAKE_C_COMPILER=${OPENMP_TEST_C_COMPILER}
-DCMAKE_CXX_COMPILER=${OPENMP_TEST_CXX_COMPILER} -DCMAKE_CXX_COMPILER=${OPENMP_TEST_CXX_COMPILER}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DetectTestCompiler WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DetectTestCompiler
OUTPUT_VARIABLE DETECT_COMPILER_OUT OUTPUT_VARIABLE DETECT_COMPILER_OUT
ERROR_VARIABLE DETECT_COMPILER_ERR ERROR_VARIABLE DETECT_COMPILER_ERR
RESULT_VARIABLE DETECT_COMPILER_RESULT) RESULT_VARIABLE DETECT_COMPILER_RESULT)
if (DETECT_COMPILER_RESULT) if (DETECT_COMPILER_RESULT)
message(STATUS "Could not detect test compilers.") message(STATUS "Could not detect test compilers.")
▲ Show 20 Lines • Show All 73 Lines • Show Last 20 Lines