Skip to content

Commit 11583e1

Browse files
authored
Updates on several templates (#155)
***NO_CI***
1 parent ad759d6 commit 11583e1

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

MetadataProcessor.Shared/SkeletonGenerator/SkeletonTemplates.cs

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ internal partial class SkeletonTemplates
3232
{{/if}}
3333
{{#newline}}
3434
35-
#ifndef _{{ShortNameUpper}}_H_{{#newline}}
36-
#define _{{ShortNameUpper}}_H_{{#newline}}
35+
#ifndef {{ShortNameUpper}}_H{{#newline}}
36+
#define {{ShortNameUpper}}_H{{#newline}}
3737
{{#newline}}
3838
3939
#include <nanoCLR_Interop.h>{{#newline}}
@@ -78,13 +78,12 @@ struct Library_{{AssemblyName}}_{{Name}}{{#newline}}
7878
{{#if Methods}}{{#newline}}{{/if}}
7979
8080
//--//{{#newline}}
81-
{{#newline}}
8281
};{{#newline}}
8382
{{#newline}}
8483
{{/each}}
8584
extern const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_{{Name}};{{#newline}}
8685
{{#newline}}
87-
#endif //_{{ShortNameUpper}}_H_{{#newline}}
86+
#endif // {{ShortNameUpper}}_H{{#newline}}
8887
";
8988

9089
internal const string AssemblyLookupTemplate =
@@ -204,8 +203,8 @@ struct Library_{{AssemblyName}}_{{Name}}{{#newline}}
204203
//
205204
//-----------------------------------------------------------------------------
206205
207-
#ifndef _{{ShortNameUpper}}_H_
208-
#define _{{ShortNameUpper}}_H_
206+
#ifndef {{ShortNameUpper}}_H
207+
#define {{ShortNameUpper}}_H
209208
210209
namespace {{RootNamespace}}
211210
{
@@ -222,7 +221,7 @@ struct {{ClassName}}
222221
}
223222
}
224223
225-
#endif //_{{ShortNameUpper}}_H_
224+
#endif // {{ShortNameUpper}}_H
226225
";
227226

228227
internal const string ClassMarshallingCodeTemplate =
@@ -297,7 +296,9 @@ struct {{ClassName}}
297296
)
298297
299298
foreach(SRC_FILE ${{{AssemblyName}}_SRCS})
299+
300300
set({{AssemblyName}}_SRC_FILE SRC_FILE-NOTFOUND)
301+
301302
find_file({{AssemblyName}}_SRC_FILE ${SRC_FILE}
302303
PATHS
303304
${BASE_PATH_FOR_THIS_MODULE}
@@ -306,8 +307,13 @@ struct {{ClassName}}
306307
307308
CMAKE_FIND_ROOT_PATH_BOTH
308309
)
309-
# message(""${SRC_FILE} >> ${{{AssemblyName}}_SRC_FILE}"") # debug helper
310+
311+
if (BUILD_VERBOSE)
312+
message(""${SRC_FILE} >> ${{{AssemblyName}}_SRC_FILE}"")
313+
endif()
314+
310315
list(APPEND {{AssemblyName}}_SOURCES ${{{AssemblyName}}_SRC_FILE})
316+
311317
endforeach()
312318
313319
include(FindPackageHandleStandardArgs)

0 commit comments

Comments
 (0)