diff --git a/lib/Interpreter/CMakeLists.txt b/lib/Interpreter/CMakeLists.txt index 48e283f0..5e260bc8 100644 --- a/lib/Interpreter/CMakeLists.txt +++ b/lib/Interpreter/CMakeLists.txt @@ -17,7 +17,7 @@ set( LLVM_LINK_COMPONENTS objcarcopts ) -add_cling_library(clingInterpreter +add_cling_library(clingInterpreter OBJECT AutoSynthesizer.cpp AutoloadCallback.cpp ASTTransformer.cpp @@ -56,9 +56,16 @@ add_cling_library(clingInterpreter LINK_LIBS clangBasic clangAST + clangParse + clangCodeGen + clangFrontend + clangDriver + clingUtils ) -add_dependencies(clingInterpreter clangBasic clangAST LLVMCore) +add_library(clingInterpreter-interface INTERFACE) +target_sources(clingInterpreter-interface INTERFACE $) +add_dependencies(clingInterpreter-interface clangBasic clangAST LLVMCore) if(NOT WIN32) set_source_files_properties(ExceptionRTTI.cpp COMPILE_FLAGS "-fexceptions -frtti") diff --git a/lib/MetaProcessor/CMakeLists.txt b/lib/MetaProcessor/CMakeLists.txt index 4306dfed..2ef9274a 100644 --- a/lib/MetaProcessor/CMakeLists.txt +++ b/lib/MetaProcessor/CMakeLists.txt @@ -6,7 +6,11 @@ # LICENSE.TXT for details. #------------------------------------------------------------------------------ -add_cling_library(clingMetaProcessor +set(LIBS + libclingInterpreter +) + +add_cling_library(clingMetaProcessor OBJECT Display.cpp InputValidator.cpp MetaLexer.cpp @@ -16,6 +20,8 @@ add_cling_library(clingMetaProcessor LINK_LIBS clangBasic + clangLex + clingInterpreter LLVMCore ) diff --git a/lib/Utils/CMakeLists.txt b/lib/Utils/CMakeLists.txt index 578e9bb7..a6240cfd 100644 --- a/lib/Utils/CMakeLists.txt +++ b/lib/Utils/CMakeLists.txt @@ -6,7 +6,7 @@ # LICENSE.TXT for details. #------------------------------------------------------------------------------ -add_cling_library(clingUtils +add_cling_library(clingUtils OBJECT AST.cpp Validation.cpp diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 2eb508b2..353f9305 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -11,4 +11,5 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../lib/UserInterface/textinput OR CLING_INCLUDE_TESTS) add_subdirectory(driver) add_subdirectory(Jupyter) + add_subdirectory(libcling) endif()