gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix nightlies (#2577)

Browse Source 
* Revert "[cmake] Narrow the list of included directories."

This reverts commit 88c16588108508eff66cc160d244c4a59eb157ed.

* Revert "[cxxmodules] Build cling runtime into module."

This reverts commit 76a9ce75d2c29c169812b0816163ac7ce27ffad5.
This commit is contained in:
Yuka Takahashi 2018-09-04 13:35:08 +02:00 committed by sftnight
parent f0a7454b53
commit 5cfd6eb61f
2 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/cling/module.modulemap
View File

@ -1,25 +1,14 @@
// Only included at runtime.
module Cling_Runtime {
module "RuntimeUniverse.h" { header "Interpreter/RuntimeUniverse.h" export * }
module "DynamicLookupRuntimeUniverse.h" { header "Interpreter/DynamicLookupRuntimeUniverse.h" export * }
module "RuntimePrintValue.h" { header "Interpreter/RuntimePrintValue.h" export * }
export *
}
// Included in both compile time and runtime.
module Cling_Runtime_Extra {
module "DynamicExprInfo.h" { header "Interpreter/DynamicExprInfo.h" export * }
module "DynamicLookupLifetimeHandler.h" { header "Interpreter/DynamicLookupLifetimeHandler.h" export * }
module "Value.h" { header "Interpreter/Value.h" export * }
export *
}
module Cling_Interpreter {
requires cplusplus
umbrella "Interpreter"
textual header "Interpreter/ClingOptions.inc"
// Only included at runtime.
exclude header "Interpreter/RuntimeUniverse.h"
exclude header "Interpreter/DynamicLookupRuntimeUniverse.h"
exclude header "Interpreter/RuntimePrintValue.h"
module * { export * }
}

15
include/cling/module.modulemap.build
View File

@ -1,15 +0,0 @@
// Only included at runtime.
module Cling_Runtime {
module "RuntimeUniverse.h" { header "Interpreter/RuntimeUniverse.h" export * }
module "DynamicLookupRuntimeUniverse.h" { header "Interpreter/DynamicLookupRuntimeUniverse.h" export * }
module "RuntimePrintValue.h" { header "Interpreter/RuntimePrintValue.h" export * }
export *
}
// Included in both compile time and runtime.
module Cling_Runtime_Extra {
module "DynamicExprInfo.h" { header "Interpreter/DynamicExprInfo.h" export * }
module "DynamicLookupLifetimeHandler.h" { header "Interpreter/DynamicLookupLifetimeHandler.h" export * }
module "Value.h" { header "Interpreter/Value.h" export * }
export *
}