Prefer XFLAIM headers for XFLAIM tools

CMakeLists.txt

@@ -405,6 +405,16 @@ function(nwflaim_common_private_target target_name)
     endif()
 endfunction()
 
+function(nwflaim_xflaim_private_target target_name)
+    # XFLAIM utility sources include local headers such as "flaimsys.h"
+    # by basename.  Keep the XFLAIM include directories ahead of the
+    # classic FLAIM ones so they do not accidentally pick up
+    # flaim/src/flaimsys.h.
+    target_include_directories(${target_name} BEFORE PRIVATE
+        "${CMAKE_CURRENT_SOURCE_DIR}/xflaim/util"
+        "${CMAKE_CURRENT_SOURCE_DIR}/xflaim/src")
+endfunction()
+
 function(nwflaim_add_tool target_name output_name library_target)
     add_executable(${target_name} ${ARGN})
     set_target_properties(${target_name} PROPERTIES OUTPUT_NAME "${output_name}")
@@ -507,14 +517,16 @@ if(NWFLAIM_BUILD_TOOLS)
             xflaim/util/flm_lutl.cpp
             xflaim/util/sharutil.cpp)
         nwflaim_common_private_target(xflaim_util_objects)
-        target_include_directories(xflaim_util_objects PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/xflaim/util")
+        nwflaim_xflaim_private_target(xflaim_util_objects)
 
         nwflaim_add_tool(xflmcheckdb_tool nwxflmcheckdb xflaim
             xflaim/util/checkdb.cpp
             $<TARGET_OBJECTS:xflaim_util_objects>)
+        nwflaim_xflaim_private_target(xflmcheckdb_tool)
         nwflaim_add_tool(xflmrebuild_tool nwxflmrebuild xflaim
             xflaim/util/rebuild.cpp
             $<TARGET_OBJECTS:xflaim_util_objects>)
+        nwflaim_xflaim_private_target(xflmrebuild_tool)
         nwflaim_add_tool(xflmview_tool nwxflmview xflaim
             xflaim/util/viewblk.cpp
             xflaim/util/view.cpp
@@ -525,11 +537,13 @@ if(NWFLAIM_BUILD_TOOLS)
             xflaim/util/viewmenu.cpp
             xflaim/util/viewsrch.cpp
             $<TARGET_OBJECTS:xflaim_util_objects>)
+        nwflaim_xflaim_private_target(xflmview_tool)
         nwflaim_add_tool(xflmdbshell_tool nwxflmdbshell xflaim
             xflaim/util/fdomedt.cpp
             xflaim/util/fshell.cpp
             xflaim/util/xshell.cpp
             $<TARGET_OBJECTS:xflaim_util_objects>)
+        nwflaim_xflaim_private_target(xflmdbshell_tool)
     endif()
 endif()