rootx: do not use file globbing

rootx/CMakeLists.txt

@@ -4,16 +4,22 @@
 ############################################################################
 
 if(x11)
-  include_directories(${X11_INCLUDE_DIR})
-  # FIXME: Why are we adding the x11 independent rootx.cxx file?
-  ROOT_EXECUTABLE(root *.cxx  ${CMAKE_SOURCE_DIR}/core/clib/src/strlcpy.c
-                  LIBRARIES ${X11_LIBRARIES} ${X11_Xpm_LIB} ${X11_Xft_LIB} ${X11_Xext_LIB})
-
-  #---CreateRootCommandLineOptions------------------------------------------------------------------
-  generateHeaders(${CMAKE_SOURCE_DIR}/core/base/src/root-argparse.py
-                  ${CMAKE_BINARY_DIR}/include/rootCommandLineOptionsHelp.h root)
+  ROOT_EXECUTABLE(root
+    src/rootx.cxx
+    src/rootxx.cxx
+    ../core/clib/src/strlcpy.c
+  )
+  target_include_directories(root
+    PRIVATE
+      ${X11_INCLUDE_DIR}
+  )
+  target_link_libraries(root
+    PRIVATE
+      ${X11_Xft_LIB}
+      ${X11_Xpm_LIB}
+      ${X11_LIBRARIES}
+  )
 elseif(cocoa)
-
   if (cxxmodules)
     # FIXME: Disable modules for ObjC/ObjC++. It has problems when compiling
     # rootxx-cocoa.mm with a lots of warnings and errors such as:
@@ -30,9 +36,15 @@ elseif(cocoa)
   # FIXME: rootxx-cocoa.mm should be compiled with -ObjC++ flag. Here we rely
   # that the compiler will recognise the extension mm and switch to the correct
   # language mode.
-  ROOT_EXECUTABLE(root rootx.cxx rootxx-cocoa.mm LIBRARIES "-framework Cocoa")
-  #---CreateRootCommandLineOptions------------------------------------------------------------------
+  ROOT_EXECUTABLE(root
+    src/rootx.cxx
+    src/rootxx-cocoa.mm
+    LIBRARIES
+      "-framework Cocoa"
+  )
+endif()
+
+if(x11 OR cocoa)
   generateHeaders(${CMAKE_SOURCE_DIR}/core/base/src/root-argparse.py
                   ${CMAKE_BINARY_DIR}/include/rootCommandLineOptionsHelp.h root)
 endif()
-