Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add CMake to generate g_CLR_InteropAssembliesNativeData #300

Merged
merged 1 commit into from
May 9, 2017
Merged

Add CMake to generate g_CLR_InteropAssembliesNativeData #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions CMake/Modules/FindNF_CoreCLR.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@ set(NF_CoreCLR_SRCS
TypeSystem.cpp
nanoSupport_CRC32.c
nanoHAL_SystemInformation.cpp

# TODO FIXME need to investigate how this file can be automated
CLR_RT_InteropAssembliesTable.cpp

# CoreLib
CorLib_Native_System_DateTime.cpp
Expand Down
58 changes: 0 additions & 58 deletions src/CLR/Core/CLR_RT_InteropAssembliesTable.cpp
View file
Open in desktop

This file was deleted.

16 changes: 16 additions & 0 deletions targets/CMSIS-OS/ChibiOS/nanoCLR/CLR_RT_InteropAssembliesTable.cpp.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//
// Copyright (c) 2017 The nanoFramework project contributors
// See LICENSE file in the project root for full license information.
//

//////////////////////////////////////////////////////////////////////////////
// This file was automatically generated by a tool. //
// Any changes you make here will be overwritten when it's generated again. //
//////////////////////////////////////////////////////////////////////////////

#include "Core.h"

const CLR_RT_NativeAssemblyData *g_CLR_InteropAssembliesNativeData[] =
{
NULL
};
6 changes: 6 additions & 0 deletions targets/CMSIS-OS/ChibiOS/nanoCLR/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ list(APPEND TARGET_CHIBIOS_NANOCLR_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/Memory.c
# append nanoCRT
list(APPEND TARGET_CHIBIOS_NANOCLR_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/nanoCRT.cpp")

# configure code file with Interop Assemblies table and...
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/CLR_RT_InteropAssembliesTable.cpp.in"
"${CMAKE_CURRENT_BINARY_DIR}/CLR_RT_InteropAssembliesTable.cpp" @ONLY)
# ... now add Interop Assemblies table to ChibiOS nanoCLR sources list
list(APPEND TARGET_CHIBIOS_NANOCLR_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/CLR_RT_InteropAssembliesTable.cpp")

# make var global
set(TARGET_CHIBIOS_NANOCLR_SOURCES ${TARGET_CHIBIOS_NANOCLR_SOURCES} CACHE INTERNAL "make global")

Expand Down