Add .gitattributes and normalize a few stray file's line endings
This commit is contained in:
parent
0e7674afa0
commit
d49d524b1c
14
.gitattributes
vendored
Executable file
14
.gitattributes
vendored
Executable file
@ -0,0 +1,14 @@
|
|||||||
|
# test files have a mix of lf/crlf, and that's a good thing, for testing, don't mess with it
|
||||||
|
# bash scripts need lines ending with lf, and that's correct for Windows too, e.g., under Cygwin
|
||||||
|
# (scripts often don't have a suffix)
|
||||||
|
* -text
|
||||||
|
*.sh text eof=lf
|
||||||
|
|
||||||
|
# txt files should be native and normalized
|
||||||
|
*.txt text
|
||||||
|
|
||||||
|
# source code can be native and normalized, but simpler if lf everywhere; will try that way
|
||||||
|
*.h text eof=lf
|
||||||
|
*.c text eof=lf
|
||||||
|
*.cpp text eof=lf
|
||||||
|
*.y text eof=lf
|
||||||
@ -1,25 +1,25 @@
|
|||||||
cmake_minimum_required(VERSION 2.8)
|
cmake_minimum_required(VERSION 2.8)
|
||||||
|
|
||||||
set(CMAKE_INSTALL_PREFIX "install" CACHE STRING "prefix" FORCE)
|
set(CMAKE_INSTALL_PREFIX "install" CACHE STRING "prefix" FORCE)
|
||||||
|
|
||||||
project(glslang)
|
project(glslang)
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set(CMAKE_GENERATOR_TOOLSET "v110" CACHE STRING "Platform Toolset" FORCE)
|
set(CMAKE_GENERATOR_TOOLSET "v110" CACHE STRING "Platform Toolset" FORCE)
|
||||||
include(ChooseMSVCCRT.cmake)
|
include(ChooseMSVCCRT.cmake)
|
||||||
elseif(UNIX)
|
elseif(UNIX)
|
||||||
add_definitions(-fPIC)
|
add_definitions(-fPIC)
|
||||||
else(WIN32)
|
else(WIN32)
|
||||||
message("unkown platform")
|
message("unkown platform")
|
||||||
endif(WIN32)
|
endif(WIN32)
|
||||||
|
|
||||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
if(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
add_definitions(-std=c++11)
|
add_definitions(-std=c++11)
|
||||||
elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
|
elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
|
||||||
add_definitions(-std=c++11)
|
add_definitions(-std=c++11)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_subdirectory(glslang)
|
add_subdirectory(glslang)
|
||||||
add_subdirectory(OGLCompilersDLL)
|
add_subdirectory(OGLCompilersDLL)
|
||||||
add_subdirectory(StandAlone)
|
add_subdirectory(StandAlone)
|
||||||
add_subdirectory(SPIRV)
|
add_subdirectory(SPIRV)
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user