Finish previous commit

main/CMakeLists.txt

@@ -13,7 +13,7 @@ ROOT_EXECUTABLE(proofserv.exe pmain.cxx LIBRARIES Core MathCore)
 ROOT_EXECUTABLE(hadd hadd.cxx LIBRARIES Core RIO Net Hist Graf Graf3d Gpad Tree Matrix MathCore Thread)
 ROOT_EXECUTABLE(rootnb.exe nbmain.cxx LIBRARIES Core)
 
-if(CMAKE_Fortran_COMPILER)
+if(fortran AND CMAKE_Fortran_COMPILER)
   ROOT_EXECUTABLE(g2root g2root.f LIBRARIES minicern)
   ROOT_EXECUTABLE(h2root h2root.cxx LIBRARIES Core RIO Net Hist Graf Graf3d Gpad Tree Matrix MathCore Thread minicern)
 endif()

test/CMakeLists.txt

@@ -282,7 +282,7 @@ ROOT_EXECUTABLE(TFormulaTests TFormulaTests.cxx LIBRARIES Hist RIO)
 ROOT_ADD_TEST(test-TFormulaTests COMMAND TFormulaTests FAILREGEX "FAILED|Error in")
 
 #--TBB basic test----------------------------------------------------------------------------------
-if(ROOT_tbb_FOUND)
+if(ROOT_imt_FOUND)
   include_directories(${TBB_INCLUDE_DIRS})
   ROOT_EXECUTABLE(testTBB testTBB.cxx LIBRARIES ${TBB_LIBRARIES})
   ROOT_ADD_TEST(test-TBB COMMAND testTBB FAILREGEX "FAILED|Error in")