[cmake][windows] Add Ninja support on Windows (root-project#16690)

* [cmake][windows] Add Ninja support on Windows

* [cmake][win] Fix native build (without Ninja)

Author: bellenot

CMakeLists.txt

@@ -704,7 +704,7 @@ Install path:      ${CMAKE_INSTALL_PREFIX}
 Compiler:          ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}
 C++ standard:      ${CMAKE_CXX_STANDARD}
 Compiler flags:")
-if(MSVC)
+if(MSVC AND NOT CMAKE_GENERATOR MATCHES Ninja)
 message(STATUS "
  - C:                         ${CMAKE_C_FLAGS}
  - C (build type specific):

builtins/cfitsio/CMakeLists.txt

@@ -13,7 +13,7 @@ if(NOT WIN32)
   set(CFITSIO_C_FLAGS -fPIC)
 endif()
 
-if(WIN32)
+if(WIN32 AND NOT CMAKE_GENERATOR MATCHES Ninja)
   if(winrtdebug)
     set(CFITSIO_BUILD_COMMAND_FLAGS "--config Debug")
   else()

builtins/pcre/CMakeLists.txt

@@ -13,13 +13,19 @@ foreach(var PCRE_FOUND PCRE_VERSION PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY PCRE_LIBR
 endforeach()
 
 if(WIN32)
-  if(winrtdebug)
-    set(PCRE_POSTFIX $<$<CONFIG:Debug>:d>)
-    set(pcre_config_kind "Debug")
+  if(CMAKE_GENERATOR MATCHES Ninja)
+    if (CMAKE_BUILD_TYPE MATCHES Debug)
+      set(PCRE_POSTFIX d)
+    endif()
   else()
-    set(pcre_config_kind "Release")
+    if(winrtdebug)
+      set(PCRE_POSTFIX $<$<CONFIG:Debug>:d>)
+      set(pcre_config_kind "Debug")
+    else()
+      set(pcre_config_kind "Release")
+    endif()
+    set(pcre_config "--config ${pcre_config_kind}")
   endif()
-  set(pcre_config "--config")
 endif()
 
 set(PCRE_VERSION "8.43" CACHE INTERNAL "" FORCE)
@@ -52,7 +58,7 @@ ExternalProject_Add(PCRE
     -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=TRUE
 
   BUILD_COMMAND
-    ${CMAKE_COMMAND} --build <BINARY_DIR> ${pcre_config} ${pcre_config_kind} --target pcre
+    ${CMAKE_COMMAND} --build <BINARY_DIR> ${pcre_config} --target pcre
 
   BUILD_BYPRODUCTS
     ${PCRE_BYPRODUCTS}

cmake/modules/RootMacros.cmake

@@ -1848,7 +1848,7 @@ function(ROOT_ADD_GTEST test_suite)
   endif(ARG_INCLUDE_DIRS)
 
   if(MSVC)
-    set(test_exports "/EXPORT:_Init_thread_abort /EXPORT:_Init_thread_epoch
+    set(test_exports "/EXPORT:_Init_thread_abort /EXPORT:_Init_thread_epoch \
         /EXPORT:_Init_thread_footer /EXPORT:_Init_thread_header /EXPORT:_tls_index")
     set_property(TARGET ${test_suite} APPEND_STRING PROPERTY LINK_FLAGS ${test_exports})
   endif()

cmake/modules/SearchInstalledSoftware.cmake

@@ -186,20 +186,31 @@ if(builtin_freetype)
   message(STATUS "Building freetype version ${freetype_version} included in ROOT itself")
   set(FREETYPE_LIBRARY ${CMAKE_BINARY_DIR}/FREETYPE-prefix/src/FREETYPE/objs/.libs/${CMAKE_STATIC_LIBRARY_PREFIX}freetype${CMAKE_STATIC_LIBRARY_SUFFIX})
   if(WIN32)
-    set(freetypebuild "Release")
-    set(freetypelib freetype.lib)
-    if(winrtdebug)
-      set(freetypebuild "Debug")
-      set(freetypelib freetyped.lib)
+    set(FREETYPE_LIB_DIR ".")
+    if(CMAKE_GENERATOR MATCHES Ninja)
+      set(freetypelib freetype.lib)
+      if (CMAKE_BUILD_TYPE MATCHES Debug)
+        set(freetypelib freetyped.lib)
+      endif()
+    else()
+      set(freetypebuild Release)
+      set(freetypelib freetype.lib)
+      if(winrtdebug)
+        set(freetypebuild Debug)
+        set(freetypelib freetyped.lib)
+      endif()
+      set(FREETYPE_LIB_DIR "${freetypebuild}")
+      set(FREETYPE_EXTRA_BUILD_ARGS --config ${freetypebuild})
     endif()
     ExternalProject_Add(
       FREETYPE
       URL ${CMAKE_SOURCE_DIR}/graf2d/freetype/src/freetype-${freetype_version}.tar.gz
       URL_HASH SHA256=efe71fd4b8246f1b0b1b9bfca13cfff1c9ad85930340c27df469733bbb620938
       INSTALL_DIR ${CMAKE_BINARY_DIR}
-      CMAKE_ARGS -G ${CMAKE_GENERATOR} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DFT_DISABLE_BZIP2=TRUE
-      BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${freetypebuild}
-      INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${freetypebuild}/${freetypelib} ${FREETYPE_LIBRARY}
+      CMAKE_ARGS -G ${CMAKE_GENERATOR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+                 -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DFT_DISABLE_BZIP2=TRUE
+      BUILD_COMMAND ${CMAKE_COMMAND} --build . ${FREETYPE_EXTRA_BUILD_ARGS}
+      INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${FREETYPE_LIB_DIR}/${freetypelib} ${FREETYPE_LIBRARY}
       LOG_DOWNLOAD 1 LOG_CONFIGURE 1 LOG_BUILD 1 LOG_INSTALL 1 BUILD_IN_SOURCE 0
       BUILD_BYPRODUCTS ${FREETYPE_LIBRARY}
       TIMEOUT 600
@@ -299,6 +310,7 @@ if(builtin_lzma)
       BUILD_COMMAND ""
       INSTALL_COMMAND ""
       LOG_DOWNLOAD 1
+      BUILD_BYPRODUCTS ${LIBLZMA_LIBRARIES}
       TIMEOUT 600
     )
     set(LIBLZMA_INCLUDE_DIR ${CMAKE_BINARY_DIR}/LZMA/src/LZMA/include)
@@ -453,18 +465,24 @@ if(asimage)
   #---AfterImage---------------------------------------------------------------
   set(AFTERIMAGE_LIBRARIES ${CMAKE_BINARY_DIR}/lib/libAfterImage${CMAKE_STATIC_LIBRARY_SUFFIX})
   if(WIN32)
-    if(winrtdebug)
-      set(astepbld "Debug")
-    else()
-      set(astepbld "Release")
+    set(ASTEP_LIB_DIR ".")
+    if(NOT CMAKE_GENERATOR MATCHES Ninja)
+      if(winrtdebug)
+        set(astepbld Debug)
+      else()
+        set(astepbld Release)
+      endif()
+      set(ASTEP_LIB_DIR "${astepbld}")
+      set(ASTEP_EXTRA_BUILD_ARGS --config ${astepbld})
     endif()
     ExternalProject_Add(
       AFTERIMAGE
       DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/graf2d/asimage/src/libAfterImage AFTERIMAGE
       INSTALL_DIR ${CMAKE_BINARY_DIR}
-      CMAKE_ARGS -G ${CMAKE_GENERATOR} -DCMAKE_VERBOSE_MAKEFILE=ON -DFREETYPE_INCLUDE_DIR=${FREETYPE_INCLUDE_DIR} -DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIR}
-      BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${astepbld}
-      INSTALL_COMMAND  ${CMAKE_COMMAND} -E copy_if_different ${astepbld}/libAfterImage.lib <INSTALL_DIR>/lib/
+      CMAKE_ARGS -G ${CMAKE_GENERATOR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+                 -DFREETYPE_INCLUDE_DIR=${FREETYPE_INCLUDE_DIR} -DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIR}
+      BUILD_COMMAND ${CMAKE_COMMAND} --build . ${ASTEP_EXTRA_BUILD_ARGS}
+      INSTALL_COMMAND  ${CMAKE_COMMAND} -E copy_if_different ${ASTEP_LIB_DIR}/libAfterImage.lib <INSTALL_DIR>/lib/
       LOG_DOWNLOAD 1 LOG_CONFIGURE 1 LOG_BUILD 1 LOG_INSTALL 1 BUILD_IN_SOURCE 0
       BUILD_BYPRODUCTS ${AFTERIMAGE_LIBRARIES}
       TIMEOUT 600
@@ -1239,12 +1257,19 @@ if(builtin_tbb)
   set(tbb_sha256 1ce48f34dada7837f510735ff1172f6e2c261b09460e3bf773b49791d247d24e)
 
   if(MSVC)
-    set(tbb_build Release)
-    if(winrtdebug)
-      set(tbb_build Debug)
-      set(tbbsuffix "_debug")
+    if(CMAKE_GENERATOR MATCHES Ninja)
+      if(CMAKE_BUILD_TYPE MATCHES Debug)
+        set(tbbsuffix "_debug")
+      endif()
+    else()
+      set(tbb_build Release)
+      if(winrtdebug)
+        set(tbb_build Debug)
+        set(tbbsuffix "_debug")
+      endif()
     endif()
     set(TBB_LIBRARIES ${CMAKE_BINARY_DIR}/lib/tbb12${tbbsuffix}.lib)
+    set(TBB_CXXFLAGS "-D__TBB_NO_IMPLICIT_LINKAGE=1")
     install(DIRECTORY ${CMAKE_BINARY_DIR}/bin/ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries FILES_MATCHING PATTERN "tbb*.dll")
     install(DIRECTORY ${CMAKE_BINARY_DIR}/lib/ DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries FILES_MATCHING PATTERN "tbb*.lib")
   else()
@@ -1822,9 +1847,21 @@ if (builtin_gtest)
 
   set(GTEST_CXX_FLAGS "${ROOT_EXTERNAL_CXX_FLAGS}")
   if(MSVC)
-    set(gtestbuild "Release")
-    if(winrtdebug)
-      set(gtestbuild "Debug")
+     if(winrtdebug)
+      set(GTEST_BUILD_TYPE Debug)
+    else()
+      set(GTEST_BUILD_TYPE Release)
+    endif()
+    set(_gtest_byproducts
+      ${_gtest_byproduct_binary_dir}/lib/gtest.lib
+      ${_gtest_byproduct_binary_dir}/lib/gtest_main.lib
+      ${_gtest_byproduct_binary_dir}/lib/gmock.lib
+      ${_gtest_byproduct_binary_dir}/lib/gmock_main.lib
+    )
+    if(CMAKE_GENERATOR MATCHES Ninja)
+      set(GTEST_BUILD_COMMAND "BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR>")
+    else()
+      set(GTEST_BUILD_COMMAND "BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config ${GTEST_BUILD_TYPE}")
     endif()
     if(asan)
       if(NOT winrtdebug)
@@ -1838,7 +1875,9 @@ if (builtin_gtest)
       -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=${_gtest_byproduct_binary_dir}/lib/
       -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO:PATH=${_gtest_byproduct_binary_dir}/lib/
       -Dgtest_force_shared_crt=ON
-      BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config ${gtestbuild})
+      ${GTEST_BUILD_COMMAND})
+  else()
+    set(GTEST_BUILD_TYPE Release)
   endif()
   if(APPLE)
     set(EXTRA_GTEST_OPTS
@@ -1857,7 +1896,7 @@ if (builtin_gtest)
     #            -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=ReleaseLibs
     #            -Dgtest_force_shared_crt=ON
     CMAKE_ARGS -G ${CMAKE_GENERATOR}
-                  -DCMAKE_BUILD_TYPE=Release
+                  -DCMAKE_BUILD_TYPE=${GTEST_BUILD_TYPE}
                   -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
                   -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
                   -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}

core/metacling/src/CMakeLists.txt

@@ -71,9 +71,7 @@ if(MSVC)
    target_include_directories(MetaCling PRIVATE
       ${CMAKE_SOURCE_DIR}/core/winnt/inc
    )
-   if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-     set_source_files_properties(TCling.cxx COMPILE_FLAGS $<$<CONFIG:Debug>:/bigobj>)
-   endif()
+   set_source_files_properties(TCling.cxx COMPILE_FLAGS /bigobj)
 endif()
 
 add_dependencies(MetaCling CLING)

core/rootcling_stage1/CMakeLists.txt

@@ -41,5 +41,7 @@ if (CMAKE_SYSTEM_NAME MATCHES FreeBSD)
   target_link_libraries(rootcling_stage1 util procstat)
 endif()
 
-set_target_properties(rootcling_stage1 PROPERTIES RUNTIME_OUTPUT_DIRECTORY src)
+if(NOT (WIN32 AND CMAKE_GENERATOR MATCHES Ninja))
+  set_target_properties(rootcling_stage1 PROPERTIES RUNTIME_OUTPUT_DIRECTORY src)
+endif()
 add_dependencies(rootcling_stage1 ClingUtils)

graf2d/win32gdk/CMakeLists.txt

@@ -34,10 +34,17 @@ file(GLOB iconvfiles "gdk/src/iconv/*.*")
 file(GLOB_RECURSE glibfiles "gdk/src/glib/*.*")
 file(GLOB_RECURSE gdkfiles "gdk/src/gdk/*.*")
 
-if(winrtdebug)
-  set(nmcxxflags "${CMAKE_CXX_FLAGS_DEBUG}" DEBUG=1)
+if(CMAKE_GENERATOR MATCHES Ninja)
+  set(nmcxxflags ${CMAKE_CXX_FLAGS_${_BUILD_TYPE_UPPER}})
+  if (CMAKE_BUILD_TYPE MATCHES "Debug")
+    set(nmcxxflags "${nmcxxflags}" DEBUG=1)
+  endif()
 else()
-  set(nmcxxflags "${CMAKE_CXX_FLAGS_RELEASE}")
+  if(winrtdebug)
+    set(nmcxxflags "${CMAKE_CXX_FLAGS_DEBUG}" DEBUG=1)
+  else()
+    set(nmcxxflags "${CMAKE_CXX_FLAGS_RELEASE}")
+  endif()
 endif()
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
   set(nmcxxflags "${nmcxxflags} -D_WIN64")

hist/unfold/inc/TUnfold.h

@@ -92,6 +92,7 @@
 
 #include <TH1D.h>
 #include <TH2D.h>
+#include <TGraph.h>
 #include <TObject.h>
 #include <TArrayI.h>
 #include <TSpline.h>

interpreter/CMakeLists.txt

@@ -257,9 +257,13 @@ if(builtin_llvm)
   get_directory_property(LLVM_TARGETS_TO_BUILD DIRECTORY llvm-project/llvm DEFINITION LLVM_TARGETS_TO_BUILD)
 
   if(MSVC)
+    if(CMAKE_GENERATOR MATCHES Ninja)
+      set(LLVM_TABLEGEN_EXE "${LLVM_BINARY_DIR}/bin/llvm-tblgen.exe")
+    else()
       set(LLVM_TABLEGEN_EXE "${LLVM_BINARY_DIR}/$<CONFIG>/bin/llvm-tblgen.exe")
+    endif()
   else()
-      set(LLVM_TABLEGEN_EXE "${LLVM_BINARY_DIR}/bin/llvm-tblgen")
+    set(LLVM_TABLEGEN_EXE "${LLVM_BINARY_DIR}/bin/llvm-tblgen")
   endif()
 else()
   # Rely on llvm-config.