From 6c059177ca1b82ba54ff5b6be74349008169d9f5 Mon Sep 17 00:00:00 2001
From: Jai Moraes <jmoraes@blackberry.com>
Date: Tue, 10 Dec 2024 09:47:25 -0500
Subject: [PATCH] Changes requested by review

---
 CMakeLists.txt      |  9 +--------
 test/CMakeLists.txt | 30 ++++++++++++++++--------------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c917a90..4b5db23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -435,14 +435,7 @@ else ()
   endif ()
   gflags_define (PATH LIBRARY_INSTALL_DIR "Directory of installed libraries, e.g., \"lib64\"" "lib${LIB_SUFFIX}")
   gflags_property (LIBRARY_INSTALL_DIR ADVANCED TRUE)
-  
-  # Cross-compiling for QNX does not install in the normal include path
-  if (QNX)
-    set (INCLUDE_INSTALL_DIR ${QNX_INCLUDE_INSTALL_DIR})
-  else()
-    set (INCLUDE_INSTALL_DIR include)
-  endif ()
-
+  set (INCLUDE_INSTALL_DIR include)
   set (CONFIG_INSTALL_DIR  ${LIBRARY_INSTALL_DIR}/cmake/${PACKAGE_NAME})
   set (PKGCONFIG_INSTALL_DIR ${LIBRARY_INSTALL_DIR}/pkgconfig)
 endif ()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d100a8f..e517407 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -169,20 +169,22 @@ add_test(NAME gflags_declare COMMAND gflags_declare_test --message "Hello gflags
 set_tests_properties(gflags_declare PROPERTIES PASS_REGULAR_EXPRESSION "Hello gflags!")
 
 # ----------------------------------------------------------------------------
-# QNX Specific Installation (ctest not compatible)
-if(QNX)
-install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-  DESTINATION ${RUNTIME_INSTALL_DIR}/gflags_tests)
-
-install(DIRECTORY ${PROJECT_SOURCE_DIR}/test/
-  DESTINATION ${RUNTIME_INSTALL_DIR}/gflags_tests
-  FILES_MATCHING
-  PATTERN "flagfile.*"
-  PATTERN "gflags_unittest_flagfile"
-  PATTERN "config" EXCLUDE
-  PATTERN "nc" EXCLUDE
-)
-endif()
+# qnx specific test installation (ctest not compatible)
+if (QNX)
+  install (
+    DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+    DESTINATION ${RUNTIME_INSTALL_DIR}/gflags_tests
+  )
+  install (
+    DIRECTORY ${PROJECT_SOURCE_DIR}/test/
+    DESTINATION ${RUNTIME_INSTALL_DIR}/gflags_tests
+    FILES_MATCHING
+    PATTERN "flagfile.*"
+    PATTERN "gflags_unittest_flagfile"
+    PATTERN "config" EXCLUDE
+    PATTERN "nc" EXCLUDE
+  )
+endif ()
 
 # ----------------------------------------------------------------------------
 # configure Python script which configures and builds a test project