Commit dd7d769a authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r242301: 

------------------------------------------------------------------------
r242301 | jlpeyton | 2015-07-15 09:57:19 -0700 (Wed, 15 Jul 2015) | 9 lines

Re-indent the CMake refactor to two-space indention

I apologize for this nasty commit, but I somehow overlooked Chandler's
comment to re-indent these files to two space indention.  I know this
is a horrible commit, but I figured if it was done quickly after the 
first one, not too many conflicts would arise.

Again, I'm sorry and won't do this again.

------------------------------------------------------------------------

llvm-svn: 242336
parent 59f879ad

openmp/runtime/CMakeLists.txt

+120 −120
Original line number Diff line number Diff line
@@ -193,10 +193,10 @@ set(LIBOMP_TOOLS_DIR ${LIBOMP_BASE_DIR}/tools) 
set(LIBOMP_INC_DIR ${LIBOMP_SRC_DIR}/include/${LIBOMP_OMP_VERSION})



# Enabling Fortran if it is needed

# Enable MASM Compiler if it is needed (Windows only)

if(${LIBOMP_FORTRAN_MODULES})

  enable_language(Fortran)

endif()

# Enable MASM Compiler if it is needed (Windows only)

if(WIN32)

  enable_language(ASM_MASM)

endif()

openmp/runtime/cmake/LibompGetArchitecture.cmake

+28 −29
Original line number Diff line number Diff line
@@ -45,8 +45,7 @@ function(libomp_get_architecture return_arch) 
    #else

      #error ARCHITECTURE=UnknownArchitecture

    #endif

    "

    )

  ")

  # Write out ${detect_arch_src_txt} to a file within the cmake/ subdirectory

  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libomp_detect_arch.c" ${detect_arch_src_txt})

openmp/runtime/cmake/LibompUtils.cmake

+94 −94

File changed.

Contains only whitespace changes.

openmp/runtime/src/CMakeLists.txt

+177 −177

File changed.

Contains only whitespace changes.

openmp/runtime/cmake/LibompCheckFortranFlag.cmake

+43 −43

File changed.

Contains only whitespace changes.

openmp/runtime/cmake/LibompMicroTests.cmake

+146 −146

File changed.

Contains only whitespace changes.

openmp/runtime/cmake/config-ix.cmake

+84 −84

File changed.

Contains only whitespace changes.

openmp/runtime/cmake/LibompCheckLinkerFlag.cmake

+45 −45

File changed.

Contains only whitespace changes.

openmp/runtime/cmake/LibompDefinitions.cmake

+80 −80

File changed.

Contains only whitespace changes.

openmp/runtime/cmake/LibompExports.cmake

+35 −35

File changed.

Contains only whitespace changes.

openmp/runtime/cmake/LibompHandleFlags.cmake

+158 −158

File changed.

Contains only whitespace changes.