Merge pull request #566 from LegalizeAdulthood/editor-config

Editor config
pull/591/merge
Kim Kulling 2015-06-29 09:56:19 +02:00
commit f3d418a199
422 changed files with 146927 additions and 146894 deletions

17
.editorconfig 100644
View File

@ -0,0 +1,17 @@
# See <http://EditorConfig.org> for details
root = true
[CMakeLists.txt,*.cmake{,.in}]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_size = 2
indent_style = space
[*.h.in]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_size = 4
indent_style = space

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
.idea
build
.project
*.kdev4*

View File

@ -0,0 +1,8 @@
# See <http://EditorConfig.org> for details
[*.{h,hpp,c,cpp}]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_size = 4
indent_style = space

View File

@ -1,4 +1,3 @@
/*
Open Asset Import Library (assimp)
----------------------------------------------------------------------

View File

@ -611,7 +611,3 @@ void BatchLoader::LoadAll()
DefaultLogger::get()->info("%%% END EXTERNAL FILE %%%");
}
}

View File

@ -1089,4 +1089,3 @@ void ColladaExporter::WriteNode(aiNode* pNode)
#endif
#endif

View File

@ -1,4 +1,4 @@
/*
/*
Open Asset Import Library (assimp)
----------------------------------------------------------------------

View File

@ -1,4 +1,3 @@
#ifndef INCLUDED_ASSBIN_CHUNKS_H
#define INCLUDED_ASSBIN_CHUNKS_H

View File

@ -0,0 +1,8 @@
# See <http://EditorConfig.org> for details
[*.{h,hpp,inl}]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_size = 4
indent_style = space

View File

@ -502,4 +502,3 @@ inline aiReturn Exporter :: Export( const aiScene* pScene, const std::string& pF
} // namespace Assimp
#endif // ASSIMP_BUILD_NO_EXPORT
#endif // AI_EXPORT_HPP_INC

View File

@ -0,0 +1,8 @@
# See <http://EditorConfig.org> for details
[*.{h,hpp,c,cpp}]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_size = 4
indent_style = space

View File

@ -63,4 +63,3 @@ target_link_libraries( unit assimp
)
endif(AddGTest_FOUND)
add_subdirectory(headercheck)

View File

@ -4,11 +4,11 @@ OPTION(ASSIMP_HEADERCHECK "adds the target headercheck which compiles every head
if(ASSIMP_HEADERCHECK)
include_directories(
${Assimp_SOURCE_DIR}/code/BoostWorkaround
)
)
FILE(GLOB_RECURSE headers
${Assimp_SOURCE_DIR}/code/*.h
)
)
set(headerchecklibs "")