Revert "[cxxmodule] Fix nightlies (#2577)"

This reverts commit 316f553.

cmake/modules/RootNewMacros.cmake

@@ -293,7 +293,7 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
 
   if(CMAKE_PROJECT_NAME STREQUAL ROOT)
     set(includedirs -I${CMAKE_SOURCE_DIR}
-                    -I${CMAKE_SOURCE_DIR}/interpreter/cling/include # This is for the RuntimeUniverse
+                    -I${CMAKE_BINARY_DIR}/etc/cling/ # This is for the RuntimeUniverse
                     -I${CMAKE_BINARY_DIR}/include)
     set(excludepaths ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
   elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/inc)

core/clingutils/CMakeLists.txt

@@ -10,24 +10,22 @@ ROOT_GLOB_HEADERS(headers ${CMAKE_CURRENT_SOURCE_DIR}/inc/*.h)
 
 set(ClingUtils_dict_headers ${headers} PARENT_SCOPE)
 
+ROOT_OBJECT_LIBRARY(ClingUtils ${sources})
+add_dependencies(ClingUtils CLING)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/res ${CMAKE_CURRENT_SOURCE_DIR}/../foundation/res)
-include_directories(${CLING_INCLUDE_DIRS})
+target_include_directories(ClingUtils PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/res ${CMAKE_CURRENT_SOURCE_DIR}/../foundation/res)
+target_include_directories(ClingUtils PRIVATE ${CLING_INCLUDE_DIRS})
 # Register the llvm include directories after clangs. This instructs the compiler to resolve
 # headers from our builtin clang. That's an issue when we are building with bultin_llvm=Off
 # and we have installed clang headers, too.
-include_directories(SYSTEM ${CLANG_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS})
+target_include_directories(ClingUtils PRIVATE SYSTEM ${CLANG_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS})
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CLING_CXXFLAGS}")
 
 # This is to avoid warnings coming from GCC 7 in llvm/src/include/llvm/ADT/DenseMap.h:1010
 if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
   ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-maybe-uninitialized)
 endif()
 
-ROOT_OBJECT_LIBRARY(ClingUtils ${sources})
-
-add_dependencies(ClingUtils CLING)
-
 ROOT_INSTALL_HEADERS()
 
 #### STL dictionary (replacement for cintdlls)##############################
@@ -87,18 +85,25 @@ install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/cling/lib/clang/${CLANG_RESOURCE_DIR_V
 #---Install a bunch of files to /etc/cling------------------------------------
 set(clinginclude    ${CMAKE_SOURCE_DIR}/interpreter/cling/include)
 
-foreach(file  Interpreter/DynamicExprInfo.h
+foreach(file module.modulemap.build
+        Interpreter/DynamicExprInfo.h
         Interpreter/DynamicLookupRuntimeUniverse.h
         Interpreter/DynamicLookupLifetimeHandler.h
         Interpreter/Exception.h
         Interpreter/RuntimePrintValue.h
         Interpreter/RuntimeUniverse.h
         Interpreter/Value.h)
   get_filename_component(path ${file} PATH)
-  list(APPEND copy_commands COMMAND ${CMAKE_COMMAND} -E copy ${clinginclude}/cling/${file} ${CMAKE_BINARY_DIR}/etc/cling/${file})
+  set(dest_file ${file})
+  if (${file} STREQUAL "module.modulemap.build")
+    set(dest_file "module.modulemap")
+  else()
+    # We do not want our modulemap to be considered part of the PCH.
+    set_property(GLOBAL APPEND PROPERTY CLINGETCPCH etc/cling/${dest_file})
+  endif()
+  list(APPEND copy_commands COMMAND ${CMAKE_COMMAND} -E copy ${clinginclude}/cling/${file} ${CMAKE_BINARY_DIR}/etc/cling/${dest_file})
   list(APPEND files_to_copy ${clinginclude}/cling/${file})
-  set_property(GLOBAL APPEND PROPERTY CLINGETCPCH etc/cling/${file})
-  install(FILES ${clinginclude}/cling/${file} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/cling/${path})
+  install(FILES ${CMAKE_BINARY_DIR}/etc/cling/${dest_file} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/cling/${path})
 endforeach()
 
 foreach(file  multimap  multiset)

core/dictgen/CMakeLists.txt

@@ -10,15 +10,22 @@
 
 ROOT_GLOB_SOURCES(sources ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cxx)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src
-        ${CMAKE_CURRENT_SOURCE_DIR}/res
-        ${CMAKE_CURRENT_SOURCE_DIR}/../foundation/res
-        ${CMAKE_CURRENT_SOURCE_DIR}/../clingutils/res)
-include_directories(${CLING_INCLUDE_DIRS})
+ROOT_OBJECT_LIBRARY(Dictgen
+  ${sources}
+)
+add_dependencies(Dictgen CLING)
+
+target_include_directories(Dictgen PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}/src
+  ${CMAKE_CURRENT_SOURCE_DIR}/res
+  ${CMAKE_CURRENT_SOURCE_DIR}/../foundation/res
+  ${CMAKE_CURRENT_SOURCE_DIR}/../clingutils/res
+)
+target_include_directories(Dictgen PRIVATE ${CLING_INCLUDE_DIRS})
 # Register the llvm include directories after clangs. This instructs the compiler to resolve
 # headers from our builtin clang. That's an issue when we are building with bultin_llvm=Off
 # and we have installed clang headers, too.
-include_directories(SYSTEM ${CLANG_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS})
+target_include_directories(Dictgen PRIVATE SYSTEM ${CLANG_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS})
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CLING_CXXFLAGS}")
 CHECK_CXX_COMPILER_FLAG("-fno-rtti" CXX_HAS_fno_rtti)
@@ -27,9 +34,3 @@ if(CXX_HAS_fno_rtti)
     set_source_files_properties(src/LinkdefReader.cxx    PROPERTIES COMPILE_FLAGS "-fno-rtti")
     set_source_files_properties(src/TModuleGenerator.cxx PROPERTIES COMPILE_FLAGS "-fno-rtti")
 endif()
-
-ROOT_OBJECT_LIBRARY(Dictgen
-  ${sources}
-)
-
-add_dependencies(Dictgen CLING)

interpreter/cling/include/cling/module.modulemap

@@ -1,14 +1,25 @@
+// 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 * }
 }
 

interpreter/cling/include/cling/module.modulemap.build

@@ -0,0 +1,15 @@
+// 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 *
+}