[CMake] CMake / include fixes for upcoming target-based CMake

CMakeLists.txt

@@ -12,6 +12,19 @@ if(WIN32)
   cmake_policy(SET CMP0091 OLD)
   set(CMAKE_SKIP_TEST_ALL_DEPENDENCY TRUE)
 endif()
+if(APPLE AND (NOT CMAKE_OSX_SYSROOT OR CMAKE_OSX_SYSROOT STREQUAL ""))
+  # The SYSROOT *must* be set before the project() call
+  execute_process(COMMAND xcrun --sdk macosx --show-sdk-path
+    OUTPUT_VARIABLE SDK_PATH
+    ERROR_QUIET
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  if(NOT EXISTS "${SDK_PATH}")
+    message(FATAL_ERROR "Could not detect macOS SDK path")
+  endif()
+
+  set(CMAKE_OSX_SYSROOT "${SDK_PATH}" CACHE PATH "SDK path" FORCE)
+endif()
 
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT ALLOW_IN_SOURCE)
   message(FATAL_ERROR

cmake/modules/SetUpMacOS.cmake

@@ -13,20 +13,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
     set(libcxx ON CACHE BOOL "Build using libc++" FORCE)
   endif()
 
-  if(NOT CMAKE_OSX_SYSROOT OR CMAKE_OSX_SYSROOT STREQUAL "")
-    execute_process(COMMAND xcrun --sdk macosx --show-sdk-path
-      OUTPUT_VARIABLE SDK_PATH
-      ERROR_QUIET
-      OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    if(NOT EXISTS "${SDK_PATH}")
-      message(FATAL_ERROR "Could not detect macOS SDK path")
-    endif()
-
-    set(CMAKE_OSX_SYSROOT "${SDK_PATH}" CACHE PATH "SDK path" FORCE)
-  endif()
-  message(STATUS "Using SDK path: ${CMAKE_OSX_SYSROOT}")
-
   #TODO: check haveconfig and rpath -> set rpath true
   #TODO: check Thread, define link command
   #TODO: more stuff check configure script

core/rint/test/TTabComTests.cxx

@@ -19,6 +19,8 @@
 
 #include "TTabCom.h"
 
+#include "gtest/gtest.h"
+
 #include <string>
 
 TEST(TTabComTests, Sanity)

core/testsupport/inc/ROOT/TestSupport.hxx

@@ -22,11 +22,10 @@
 #include "TError.h"
 #include "TInterpreter.h"
 
+#include <iostream>
 #include <stdexcept>
 #include <vector>
 
-#include "gtest/gtest.h"
-
 namespace ROOT {
 namespace TestSupport {
 

core/testsupport/src/TestSupport.cxx

@@ -13,6 +13,8 @@
 
 #include "ROOT/TestSupport.hxx"
 
+#include "gtest/gtest.h"
+
 #include <algorithm>
 #include <cstring>
 #include <iostream>

io/io/test/TFileMergerTests.cxx

@@ -12,6 +12,8 @@
 
 #include <memory>
 
+#include "gtest/gtest.h"
+
 static void CreateATuple(TMemFile &file, const char *name, double value)
 {
    auto mytree = new TTree(name, "A tree");

tmva/sofie/test/CMakeLists.txt

@@ -117,6 +117,7 @@ if (BLAS_FOUND)
     # Creating a Google Test for the automatic differentiation of Gemm_Call
     ROOT_ADD_GTEST(TestGemmDerivative TestGemmDerivative.cxx
       LIBRARIES
+        Core
         BLAS::BLAS
       INCLUDE_DIRS
         ${CMAKE_CURRENT_BINARY_DIR}

tmva/sofie/test/TestGemmDerivative.cxx

@@ -1,5 +1,4 @@
 #include <TInterpreter.h>
-#include <TInterpreterValue.h>
 
 #include "gtest/gtest.h"
 

tree/dataframe/test/dataframe_datasetspec.cxx

@@ -7,7 +7,6 @@
 #include <ROOT/RDF/RSample.hxx>
 #include <ROOT/RDF/RDatasetSpec.hxx>
 #include <ROOT/RDF/RMetaData.hxx>
-#include <nlohmann/json.hpp>
 #include <TSystem.h>
 
 #include <thread> // std::thread::hardware_concurrency

tree/treeplayer/test/ttreereader_friends.cxx

@@ -6,6 +6,8 @@
 #include "ROOT/TestSupport.hxx"
 #include <string>
 
+#include "gtest/gtest.h"
+
 struct TTreeReaderFriends : public ::testing::Test {
    constexpr static auto fMainTreeName{"tree_10entries"};
    constexpr static auto fMainFileName{"tree_10entries.root"};