Skip to content

Commit 2e358a7

Browse files
Fix forward declaration + tabs to spaces
1 parent 59985ba commit 2e358a7

File tree

8 files changed

+69
-69
lines changed

8 files changed

+69
-69
lines changed

Examples/CMakeLists.txt

+18-18
Original file line numberDiff line numberDiff line change
@@ -43,28 +43,28 @@ add_library(${TEST_MODULE_TARGET} ${META_GENERATED_FILES})
4343
target_link_libraries(${TEST_MODULE_TARGET} MetaRuntime)
4444

4545
if (MSVC)
46-
add_compile_options(
47-
# treat warnings as errors
48-
/WX
49-
# multi process compilation
50-
/MP
51-
)
46+
add_compile_options(
47+
# treat warnings as errors
48+
/WX
49+
# multi process compilation
50+
/MP
51+
)
5252
else ()
53-
add_compile_options(
54-
-std=c++11
55-
)
53+
add_compile_options(
54+
-std=c++11
55+
)
5656
endif ()
5757

5858
macro (add_meta_test TARGET SOURCES)
59-
add_executable(${TARGET}
60-
${TEST_HEADERS}
61-
${TEST_META_GENERATED_HEADERS}
62-
${TEST_META_GENERATED_SOURCES}
63-
${SOURCES}
64-
)
65-
66-
target_link_libraries(${TARGET} MetaRuntime ${TEST_MODULE_TARGET})
67-
set_property(TARGET ${TARGET} PROPERTY FOLDER Tests)
59+
add_executable(${TARGET}
60+
${TEST_HEADERS}
61+
${TEST_META_GENERATED_HEADERS}
62+
${TEST_META_GENERATED_SOURCES}
63+
${SOURCES}
64+
)
65+
66+
target_link_libraries(${TARGET} MetaRuntime ${TEST_MODULE_TARGET})
67+
set_property(TARGET ${TARGET} PROPERTY FOLDER Tests)
6868
endmacro ()
6969

7070
add_meta_test(MetaProperties MetaProperties.cpp)

Resources/Templates/module-file-source.mustache

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void meta_generated::DefineModuleFile{{targetName}}{{moduleFileName}}(m::Reflect
8484
{{#global}}
8585
db.AddGlobal<{{& type}}>( "{{& qualifiedName}}",
8686
{{#isGetterAccessible}}{{> getterBody}},{{/isGetterAccessible}}{{^isGetterAccessible}}
87-
nullptr,{{/isGetterAccessible}}{{#isSetterAccessible}}
87+
nullptr,{{/isGetterAccessible}}{{#isSetterAccessible}}
8888
{{> setterBody}},{{/isSetterAccessible}}{{^isSetterAccessible}}
8989
nullptr,{{/isSetterAccessible}}
9090
{

Source/CMake/FindLLVM.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ find_path(LLVM_INCLUDE_DIRS
2929

3030
if (LIBCLANG_USE_STATIC_LIBRARY)
3131
# find static library directory
32-
find_path(LLVM_STATIC_LIBRARY_DIR
33-
NAMES ${LIBCLANG_LIBRARY_NAME}
32+
find_path(LLVM_LIBRARY_DIR
33+
NAMES ${LIBCLANG_STATIC_LIBRARY_NAME}
3434
PATHS ${LLVM_SEARCH_PATHS}
3535
PATH_SUFFIXES "lib" "bin"
3636
)

Source/CMake/MetaParser.cmake

+38-38
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
include(CMakeParseArguments)
22

33
function(meta_parser_prebuild)
4-
set(ONE_VALUE_ARGS
5-
TARGET
6-
GENERATED_DIR
7-
SOURCE_ROOT
8-
MODULE_HEADER
9-
OUT_MODULE_SOURCE
10-
OUT_GENERATED_FILES
11-
OUT_INC
12-
OUT_SRC
13-
)
14-
15-
set(MULTI_VALUE_ARGS
16-
HEADER_FILES
17-
)
18-
19-
cmake_parse_arguments(PREBUILD_META "" "${ONE_VALUE_ARGS}" "${MULTI_VALUE_ARGS}" ${ARGN})
4+
set(ONE_VALUE_ARGS
5+
TARGET
6+
GENERATED_DIR
7+
SOURCE_ROOT
8+
MODULE_HEADER
9+
OUT_MODULE_SOURCE
10+
OUT_GENERATED_FILES
11+
OUT_INC
12+
OUT_SRC
13+
)
14+
15+
set(MULTI_VALUE_ARGS
16+
HEADER_FILES
17+
)
18+
19+
cmake_parse_arguments(PREBUILD_META "" "${ONE_VALUE_ARGS}" "${MULTI_VALUE_ARGS}" ${ARGN})
2020

2121
# source file for this reflection module
2222
set(MODULE_SOURCE "${PREBUILD_META_GENERATED_DIR}/Module.${PREBUILD_META_TARGET}.Generated.cpp")
@@ -68,25 +68,25 @@ function(meta_parser_prebuild)
6868
endfunction ()
6969

7070
function(meta_parser_build)
71-
set(ONE_VALUE_ARGS
72-
TARGET
73-
SOURCE_ROOT
74-
SOURCE_FILE
75-
MODULE_HEADER
76-
MODULE_SOURCE_FILE
77-
GENERATED_DIR
78-
PCH_NAME
79-
PARSER_EXECUTABLE
80-
)
81-
82-
set(MULTI_VALUE_ARGS
83-
DEFINES
84-
INCLUDES
85-
GENERATED_FILES
86-
HEADER_FILES
87-
)
88-
89-
cmake_parse_arguments(BUILD_META "" "${ONE_VALUE_ARGS}" "${MULTI_VALUE_ARGS}" ${ARGN})
71+
set(ONE_VALUE_ARGS
72+
TARGET
73+
SOURCE_ROOT
74+
SOURCE_FILE
75+
MODULE_HEADER
76+
MODULE_SOURCE_FILE
77+
GENERATED_DIR
78+
PCH_NAME
79+
PARSER_EXECUTABLE
80+
)
81+
82+
set(MULTI_VALUE_ARGS
83+
DEFINES
84+
INCLUDES
85+
GENERATED_FILES
86+
HEADER_FILES
87+
)
88+
89+
cmake_parse_arguments(BUILD_META "" "${ONE_VALUE_ARGS}" "${MULTI_VALUE_ARGS}" ${ARGN})
9090

9191
get_property(DIRECTORIES TARGET ${BUILD_META_TARGET} PROPERTY INCLUDE_DIRECTORIES)
9292

@@ -101,15 +101,15 @@ function(meta_parser_build)
101101
set(INCLUDES_FILE "${BUILD_META_GENERATED_DIR}/Module.${BUILD_META_TARGET}.Includes.txt")
102102

103103
file(WRITE ${INCLUDES_FILE} ${INCLUDES})
104-
104+
105105
set(DEFINES ${GLOBAL_META_DEFINES} ${BUILD_META_DEFINES})
106106

107107
string(REPLACE " " "" DEFINES_TRIMMED "${DEFINES}")
108108

109109
if ("${DEFINES_TRIMMED}" STREQUAL "")
110-
set(DEFINES_SWITCH )
110+
set(DEFINES_SWITCH )
111111
else ()
112-
set(DEFINES_SWITCH --defines "${DEFINES}")
112+
set(DEFINES_SWITCH --defines "${DEFINES}")
113113
endif ()
114114

115115
# empty source files need to include the precompiled header

Source/Parser/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ if (MSVC)
117117
/MP
118118
)
119119

120-
# detect version of Visual Studio
121-
if (MSVC10)
120+
# detect version of Visual Studio
121+
if (MSVC10)
122122
set(VS_VERSION "10")
123123
elseif (MSVC11)
124124
set(VS_VERSION "11")
@@ -128,7 +128,7 @@ if (MSVC)
128128
set(VS_VERSION "14")
129129
endif()
130130

131-
# cmake is gross sometimes
131+
# cmake is gross sometimes
132132
set(_PROGRAM_FILES_x86 "ProgramFiles(x86)")
133133
set(PROGRAM_FILES_x86 "$ENV{${_PROGRAM_FILES_x86}}")
134134
set(SYSTEM_INCLUDES "${PROGRAM_FILES_x86}/Microsoft Visual Studio ${VS_VERSION}.0/VC/include")
@@ -153,7 +153,7 @@ endif ()
153153
# copy resources on post build
154154
add_custom_command(TARGET MetaParser POST_BUILD
155155
# mustache templates directory
156-
COMMAND ${CMAKE_COMMAND} -E copy_directory
156+
COMMAND ${CMAKE_COMMAND} -E copy_directory
157157
"${CMAKE_CURRENT_LIST_DIR}/../../Resources"
158158
$<TARGET_FILE_DIR:MetaParser>
159159
# LibClang shared library

Source/Runtime/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ else ()
167167
endif ()
168168

169169
set(META_RUNTIME_INCLUDE_DIRS
170-
"${CMAKE_CURRENT_LIST_DIR}"
171-
"${CMAKE_CURRENT_LIST_DIR}/../"
172-
"${CMAKE_CURRENT_LIST_DIR}/../Common/Lib"
173-
CACHE STRING "Location of the runtime include directories."
170+
"${CMAKE_CURRENT_LIST_DIR}"
171+
"${CMAKE_CURRENT_LIST_DIR}/../"
172+
"${CMAKE_CURRENT_LIST_DIR}/../Common/Lib"
173+
CACHE STRING "Location of the runtime include directories."
174174
)

Source/Runtime/Impl/MetaManager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace ursine
1717
{
1818
static_assert( std::is_base_of<MetaProperty, PropertyType>::value,
1919
"Type must be a MetaProperty."
20-
);
20+
);
2121

2222
static const auto type = typeof( PropertyType );
2323

Source/Runtime/TypeData.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace ursine
2424
{
2525
namespace meta
2626
{
27-
struct ReflectionDatabase;
27+
class ReflectionDatabase;
2828

2929
struct TypeData
3030
{

0 commit comments

Comments
 (0)