Skip to content

Commit df0a038

Browse files
AustinBrunkhorstAustinBrunkhorst
committed
Builds on gcc / clang!
1 parent 6f2bb8c commit df0a038

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+790
-434
lines changed

‎Examples/CMakeLists.txt

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,21 @@ meta_parser_prebuild(
4040

4141
add_library(${TEST_MODULE_TARGET} ${META_GENERATED_FILES})
4242

43+
target_link_libraries(${TEST_MODULE_TARGET} MetaRuntime)
44+
45+
if (MSVC)
46+
add_compile_options(
47+
# treat warnings as errors
48+
/WX
49+
# multi process compilation
50+
/MP
51+
)
52+
else ()
53+
add_compile_options(
54+
-std=c++11
55+
)
56+
endif ()
57+
4358
macro (add_meta_test TARGET SOURCES)
4459
add_executable(${TARGET}
4560
${TEST_HEADERS}
@@ -68,4 +83,4 @@ meta_parser_build(
6883
MODULE_SOURCE_FILE ${META_MODULE_SOURCE}
6984
HEADER_FILES ${TEST_HEADERS}
7085
PARSER_EXECUTABLE "$<TARGET_FILE:MetaParser>"
71-
)
86+
)

‎Examples/FunctionsAndMethods.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
#include "TestTypes.h"
44
#include "TestProperties.h"
55

6+
#include "TypeCreator.h"
7+
68
using namespace ursine::meta;
79

810
int main(void)
@@ -16,7 +18,7 @@ int main(void)
1618
Method loadMethod = soundEffectType.GetMethod( "Load" );
1719

1820
// creates an instance of a sound effect
19-
Variant effect = soundEffectType.Create( );
21+
Variant effect = TypeCreator::Create( soundEffectType );
2022

2123
// effect.volume is now 85
2224
volumeField.SetValue( effect, 85.0f );

‎Resources/Templates/module-file-source.mustache

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,10 @@ void meta_generated::DefineModuleFile{{targetName}}{{moduleFileName}}(m::Reflect
8282
// Global Definitions
8383
///////////////////////////////////////////////////////////////////////////
8484
{{#global}}
85-
db.AddGlobal<{{& type}}>( "{{& qualifiedName}}",{{#isGetterAccessible}}
86-
[](void)
87-
{
88-
return m::Variant { {{> getterBody}} };
89-
},{{/isGetterAccessible}}{{^isGetterAccessible}}
90-
nullptr,{{/isGetterAccessible}}{{#isSetterAccessible}}
91-
[](const m::Argument &value)
92-
{
93-
{{> setterBody}}
94-
},{{/isSetterAccessible}}{{^isSetterAccessible}}
85+
db.AddGlobal<{{& type}}>( "{{& qualifiedName}}",
86+
{{#isGetterAccessible}}{{> getterBody}},{{/isGetterAccessible}}{{^isGetterAccessible}}
87+
nullptr,{{/isGetterAccessible}}{{#isSetterAccessible}}
88+
{{> setterBody}},{{/isSetterAccessible}}{{^isSetterAccessible}}
9589
nullptr,{{/isSetterAccessible}}
9690
{
9791
{{> metaDataInitializerList}}
@@ -114,9 +108,9 @@ void meta_generated::DefineModuleFile{{targetName}}{{moduleFileName}}(m::Reflect
114108
///////////////////////////////////////////////////////////////////////////
115109
{{#enum}}
116110
{
117-
auto typeID = m::TypeInfo<{{& qualifiedName}}>::ID;
111+
auto typeID = typeidof( {{& qualifiedName}} );
118112

119-
if (typeID != m::Type::Invalid && !m::TypeInfo<{{& qualifiedName}}>::Defined)
113+
if (typeID != m::InvalidTypeID && !m::TypeInfo<{{& qualifiedName}}>::Defined)
120114
{
121115
auto &type = db.types[ typeID ];
122116
@@ -142,9 +136,9 @@ void meta_generated::DefineModuleFile{{targetName}}{{moduleFileName}}(m::Reflect
142136
* {{& qualifiedName}}
143137
*/
144138
{
145-
auto typeID = m::TypeInfo<{{& qualifiedName}}>::ID;
139+
auto typeID = typeidof( {{& qualifiedName}} );
146140

147-
if (typeID != m::Type::Invalid && !m::TypeInfo<{{& qualifiedName}}>::Defined)
141+
if (typeID != m::InvalidTypeID && !m::TypeInfo<{{& qualifiedName}}>::Defined)
148142
{
149143
auto &type = db.types[ typeID ];
150144
@@ -220,4 +214,4 @@ void meta_generated::DefineModuleFile{{targetName}}{{moduleFileName}}(m::Reflect
220214
m::TypeInfo<{{& qualifiedName}}>::Defined = true;
221215
}
222216
}{{/class}}
223-
}
217+
}

‎Source/CMake/FindLLVM.cmake

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
1+
# by default, only use the libclang static lib on MSVC
2+
if (NOT DEFINED LIBCLANG_USE_STATIC_LIBRARY)
3+
if (MSVC)
4+
set(LIBCLANG_USE_STATIC_LIBRARY YES)
5+
else ()
6+
set(LIBCLANG_USE_STATIC_LIBRARY NO)
7+
endif ()
8+
endif ()
9+
110
set(LLVM_SEARCH_PATHS
211
${LLVM_ROOT}
312
$ENV{LLVM_ROOT}
413
)
514

6-
set(LIBCLANG_LIBRARY_NAME
15+
set(LIBCLANG_STATIC_LIBRARY_NAME
716
"libclang${CMAKE_STATIC_LIBRARY_SUFFIX}"
817
)
918

10-
set(LIBCLANG_SHARED_LIBRARY_NAME
19+
set(LIBCLANG_SHARED_LIBRARY_NAME
1120
"libclang${CMAKE_SHARED_LIBRARY_SUFFIX}"
1221
)
1322

@@ -18,34 +27,41 @@ find_path(LLVM_INCLUDE_DIRS
1827
PATH_SUFFIXES "include"
1928
)
2029

21-
# static library directory
22-
find_path(LLVM_LIBRARY_DIR
23-
NAMES ${LIBCLANG_LIBRARY_NAME}
24-
PATHS ${LLVM_SEARCH_PATHS}
25-
PATH_SUFFIXES "lib"
26-
)
30+
if (LIBCLANG_USE_STATIC_LIBRARY)
31+
# find static library directory
32+
find_path(LLVM_STATIC_LIBRARY_DIR
33+
NAMES ${LIBCLANG_LIBRARY_NAME}
34+
PATHS ${LLVM_SEARCH_PATHS}
35+
PATH_SUFFIXES "lib" "bin"
36+
)
37+
endif ()
2738

2839
# shared library directory
2940
find_path(LLVM_BINARY_DIR
3041
NAMES ${LIBCLANG_SHARED_LIBRARY_NAME}
3142
PATHS ${LLVM_SEARCH_PATHS}
32-
PATH_SUFFIXES "bin"
43+
PATH_SUFFIXES "bin" "lib"
3344
)
3445

3546
# unable to find everything
36-
if (NOT LLVM_INCLUDE_DIRS OR
37-
NOT LLVM_LIBRARY_DIR OR
38-
NOT LLVM_BINARY_DIR)
47+
if (NOT LLVM_INCLUDE_DIRS OR
48+
NOT LLVM_BINARY_DIR OR
49+
(NOT LLVM_LIBRARY_DIR AND LIBCLANG_USE_STATIC_LIBRARY))
3950
message(SEND_ERROR
4051
"Unable to find LLVM installation. "
4152
"Make sure that \"LLVM_ROOT\" is set with the installation directory in either an environment variable or through the CMake GUI."
4253
)
4354
endif ()
4455

45-
set(LLVM_LIBCLANG_LIBRARY
46-
"${LLVM_LIBRARY_DIR}/${LIBCLANG_LIBRARY_NAME}"
56+
set(LIBCLANG_SHARED_LIBRARY
57+
"${LLVM_BINARY_DIR}/${LIBCLANG_SHARED_LIBRARY_NAME}"
4758
)
4859

49-
set(LLVM_LIBCLANG_SHARED_LIBRARY
50-
"${LLVM_BINARY_DIR}/${LIBCLANG_SHARED_LIBRARY_NAME}"
51-
)
60+
if (LIBCLANG_USE_STATIC_LIBRARY)
61+
set(LIBCLANG_LIBRARY
62+
"${LLVM_LIBRARY_DIR}/${LIBCLANG_STATIC_LIBRARY_NAME}"
63+
)
64+
else ()
65+
# we can assume this is a unix system, in which case we link to the shared object file
66+
set(LIBCLANG_LIBRARY ${LIBCLANG_SHARED_LIBRARY})
67+
endif ()

‎Source/CMake/MetaParser.cmake

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ function(meta_parser_prebuild)
3939
get_filename_component(BASE_NAME ${HEADER} NAME_WE)
4040
get_filename_component(EXTENSION ${HEADER} EXT)
4141

42+
# make sure the path is absolute
43+
if (NOT IS_ABSOLUTE ${HEADER})
44+
set(DIRECTORY_NAME "${PREBUILD_META_SOURCE_ROOT}/${DIRECTORY_NAME}")
45+
endif ()
46+
4247
# skip hpp files
4348
if (NOT "${EXTENSION}" STREQUAL ".hpp")
4449
file(RELATIVE_PATH RELATIVE
@@ -137,7 +142,7 @@ function(meta_parser_build)
137142
add_custom_command(
138143
OUTPUT ${BUILD_META_GENERATED_FILES}
139144
DEPENDS ${BUILD_META_HEADER_FILES}
140-
COMMAND call ${BUILD_META_PARSER_EXECUTABLE}
145+
COMMAND ${BUILD_META_PARSER_EXECUTABLE}
141146
--target-name "${BUILD_META_TARGET}"
142147
--source-root "${BUILD_META_SOURCE_ROOT}"
143148
--in-source "${BUILD_META_SOURCE_ROOT}/${BUILD_META_SOURCE_FILE}"

‎Source/Common/Compiler.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
#pragma once
22

3-
#if _MSC_VER && !__INTEL_COMPILER
3+
#if defined(__clang__)
4+
5+
#define COMPILER_CLANG
6+
7+
#elif defined(__GNUC__) || defined(__GNUG__)
8+
9+
#define COMPILER_GNU
10+
11+
#elif defined(_MSC_VER) && !__INTEL_COMPILER
412

513
#define COMPILER_MSVC
614

‎Source/Parser/CMakeLists.txt

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,24 @@ include_directories(../Common/Lib)
9898
# them in the solution explorer without them being added to the list of sources
9999
add_executable(MetaParser ${HEADER_FILES} ${SOURCE_FILES})
100100

101+
link_directories(${LLVM_LIBRARY_DIR})
102+
101103
# statically link with Boost & LibClang
102-
target_link_libraries(MetaParser ${Boost_LIBRARIES} ${LLVM_LIBCLANG_LIBRARY})
104+
target_link_libraries(MetaParser ${Boost_LIBRARIES} ${LIBCLANG_LIBRARY})
103105

104106
set_precompiled_header(MetaParser Precompiled.h Precompiled.cpp)
105107

106108
if (MSVC)
107109
# disable security warnings
108110
add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
109111

110-
# treat warnings as errors
111-
target_compile_options(MetaParser PUBLIC /WX)
112-
113-
# multi process compilation
114-
target_compile_options(MetaParser PUBLIC /MP)
112+
target_compile_options(MetaRuntime
113+
PUBLIC
114+
# treat warnings as errors
115+
/WX
116+
# multi process compilation
117+
/MP
118+
)
115119

116120
# detect version of Visual Studio
117121
if (MSVC10)
@@ -131,19 +135,29 @@ if (MSVC)
131135

132136
# normalize slashes
133137
string(REPLACE "\\" "/" SYSTEM_INCLUDES "${SYSTEM_INCLUDES}")
138+
else ()
139+
target_compile_options(MetaParser
140+
PUBLIC -std=c++11
141+
)
142+
143+
set(SYSTEM_INCLUDES "/usr/include/c++/${CMAKE_CXX_COMPILER_VERSION}")
144+
endif ()
134145

146+
if (SYSTEM_INCLUDES)
135147
# visual studio seems to have issues with escape characters in post build commands
136148
set_property(TARGET MetaParser APPEND PROPERTY COMPILE_DEFINITIONS SYSTEM_INCLUDE_DIRECTORY="${SYSTEM_INCLUDES}")
137149
else ()
138150
message(FATAL_ERROR "System include directories not implemented for this compiler.")
139151
endif ()
140152

141-
# copy shared libraries and resources on post build
153+
# copy resources on post build
142154
add_custom_command(TARGET MetaParser POST_BUILD
143-
COMMAND ${CMAKE_COMMAND} -E copy_if_different
144-
${LLVM_LIBCLANG_SHARED_LIBRARY}
145-
$<TARGET_FILE_DIR:MetaParser>
155+
# mustache templates directory
146156
COMMAND ${CMAKE_COMMAND} -E copy_directory
147157
"${CMAKE_CURRENT_LIST_DIR}/../../Resources"
148158
$<TARGET_FILE_DIR:MetaParser>
149-
)
159+
# LibClang shared library
160+
COMMAND ${CMAKE_COMMAND} -E copy_if_different
161+
${LIBCLANG_SHARED_LIBRARY}
162+
$<TARGET_FILE_DIR:MetaParser>
163+
)

‎Source/Parser/LanguageTypes/Class.cpp

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -104,27 +104,6 @@ Class::Class(const Cursor &cursor, const Namespace &currentNamespace)
104104
}
105105
}
106106

107-
Class::~Class(void)
108-
{
109-
for (auto *baseClass : m_baseClasses)
110-
delete baseClass;
111-
112-
for (auto *constructor : m_constructors)
113-
delete constructor;
114-
115-
for (auto *field : m_fields)
116-
delete field;
117-
118-
for (auto *staticField : m_staticFields)
119-
delete staticField;
120-
121-
for (auto *method : m_methods)
122-
delete method;
123-
124-
for (auto *staticMethod : m_staticMethods)
125-
delete staticMethod;
126-
}
127-
128107
bool Class::ShouldCompile(void) const
129108
{
130109
return isAccessible( ) && !isNativeType( m_qualifiedName );
@@ -152,7 +131,7 @@ TemplateData Class::CompileTemplate(const ReflectionParser *context) const
152131

153132
int i = 0;
154133

155-
for (auto *baseClass : m_baseClasses)
134+
for (auto &baseClass : m_baseClasses)
156135
{
157136
// ignore native types
158137
if (isNativeType( baseClass->name ))
@@ -181,12 +160,11 @@ TemplateData Class::CompileTemplate(const ReflectionParser *context) const
181160
{
182161
TemplateData constructors { TemplateData::Type::List };
183162

184-
for (auto *ctor : m_constructors)
163+
for (auto &ctor : m_constructors)
185164
{
186165
if (ctor->ShouldCompile( ))
187166
constructors << ctor->CompileTemplate( context );
188167
}
189-
190168

191169
data[ "constructor" ] = constructors;
192170
data[ "dynamicConstructor" ] = constructors;
@@ -196,7 +174,7 @@ TemplateData Class::CompileTemplate(const ReflectionParser *context) const
196174
{
197175
TemplateData fields { TemplateData::Type::List };
198176

199-
for (auto *field : m_fields)
177+
for (auto &field : m_fields)
200178
{
201179
if (field->ShouldCompile( ))
202180
fields << field->CompileTemplate( context );
@@ -209,7 +187,7 @@ TemplateData Class::CompileTemplate(const ReflectionParser *context) const
209187
{
210188
TemplateData staticFields { TemplateData::Type::List };
211189

212-
for (auto *staticField : m_staticFields)
190+
for (auto &staticField : m_staticFields)
213191
{
214192
if (staticField->ShouldCompile( ))
215193
staticFields << staticField->CompileTemplate( context );
@@ -222,7 +200,7 @@ TemplateData Class::CompileTemplate(const ReflectionParser *context) const
222200
{
223201
TemplateData methods { TemplateData::Type::List };
224202

225-
for (auto *method : m_methods)
203+
for (auto &method : m_methods)
226204
{
227205
if (method->ShouldCompile( ))
228206
methods << method->CompileTemplate( context );
@@ -235,7 +213,7 @@ TemplateData Class::CompileTemplate(const ReflectionParser *context) const
235213
{
236214
TemplateData staticMethods { TemplateData::Type::List };
237215

238-
for (auto *staticMethod : m_staticMethods)
216+
for (auto &staticMethod : m_staticMethods)
239217
{
240218
if (staticMethod->ShouldCompile( ))
241219
staticMethods << staticMethod->CompileTemplate( context );

0 commit comments

Comments
 (0)