File tree Expand file tree Collapse file tree 2 files changed +12
-5
lines changed Expand file tree Collapse file tree 2 files changed +12
-5
lines changed Original file line number Diff line number Diff line change @@ -119,10 +119,6 @@ ROOT_LINKER_LIBRARY(Cling
119119# When these two link at the same time, they can exhaust the RAM on many machines, since they both link against llvm. 
120120add_dependencies (Cling rootcling_stage1)
121121
122- if (testing)
123-   set_target_properties (CppInterOpUnitTests PROPERTIES EXCLUDE_FROM_ALL  OFF )
124- endif ()
125- 
126122if (MSVC )
127123  set_target_properties (Cling PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE )
128124  set (cling_exports ${cling_exports} 
Original file line number Diff line number Diff line change @@ -523,6 +523,17 @@ set(CPPINTEROP_INCLUDE_DIRS
523523  CACHE  STRING  "CppInterOp include directories." )
524524
525525#---Set InterOp to build on Cling, this can be toggled to use Clang-REPL------------------------------------------------------- 
526- set (CPPINTEROP_USE_CLING ON  BOOL  "Use Cling as backend" )
526+ set (CPPINTEROP_USE_CLING ON  CACHE  BOOL  ""  FORCE)
527+ set (CPPINTEROP_USE_REPL OFF  CACHE  BOOL  ""  FORCE)
528+ 
529+ #---Disable testing on InterOp if ROOT's testing is OFF (InterOp tests are enabled by default) ------------------------------------------------------- 
530+ if (testing)
531+   set (CPPINTEROP_ENABLE_TESTING ON  CACHE  BOOL  ""  FORCE)
532+ else ()
533+   set (CPPINTEROP_ENABLE_TESTING OFF  CACHE  BOOL  "" )
534+ endif ()
527535
528536add_subdirectory (CppInterOp)
537+ if (testing)
538+   set_target_properties (CppInterOpUnitTests PROPERTIES EXCLUDE_FROM_ALL  OFF )
539+ endif ()
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments