From 6564afda68b8d54314e02086979d3a037634d4cd Mon Sep 17 00:00:00 2001
From: Gabriel Ferreira <gabrielcarvfer@gmail.com>
Date: Fri, 28 Jan 2022 14:08:53 -0300
Subject: [PATCH] build: move sqlite checking back to macros_and_definitions

---
 buildsupport/macros_and_definitions.cmake | 15 ++++++
 src/stats/CMakeLists.txt                  | 66 ++++++++---------------
 2 files changed, 36 insertions(+), 45 deletions(-)

diff --git a/buildsupport/macros_and_definitions.cmake b/buildsupport/macros_and_definitions.cmake
index f9a45aa3e..17cdb406c 100644
--- a/buildsupport/macros_and_definitions.cmake
+++ b/buildsupport/macros_and_definitions.cmake
@@ -485,6 +485,20 @@ macro(process_options)
     endif()
   endif()
 
+  set(ENABLE_SQLITE False)
+  if(${NS3_SQLITE})
+    find_package(
+            SQLite3
+            QUIET
+    )
+
+    if(${SQLite3_FOUND})
+      set(ENABLE_SQLITE True)
+    else()
+      message(STATUS SQLite was not found)
+    endif()
+  endif()
+
   if(${NS3_NATIVE_OPTIMIZATIONS} AND ${GCC})
     add_compile_options(-march=native -mtune=native)
   endif()
@@ -935,6 +949,7 @@ macro(process_options)
   check_include_file_cxx("stdlib.h" "HAVE_STDLIB_H")
   check_include_file_cxx("signal.h" "HAVE_SIGNAL_H")
   check_include_file_cxx("netpacket/packet.h" "HAVE_PACKETH")
+  check_include_file_cxx(semaphore.h HAVE_SEMAPHORE_H)
   check_function_exists("getenv" "HAVE_GETENV")
 
   configure_file(
diff --git a/src/stats/CMakeLists.txt b/src/stats/CMakeLists.txt
index 545dacc42..a14d77271 100644
--- a/src/stats/CMakeLists.txt
+++ b/src/stats/CMakeLists.txt
@@ -1,51 +1,27 @@
-if(${NS3_SQLITE})
-  find_package(
-    SQLite3
-    QUIET
+set(sqlite_sources)
+set(sqlite_header)
+set(sqlite_libraries)
+if(${ENABLE_SQLITE})
+  set(sqlite_sources
+      model/sqlite-data-output.cc
   )
-  check_include_file_cxx(
-    semaphore.h
-    HAVE_SEMAPHORE_H
+  set(sqlite_headers
+      model/sqlite-data-output.h
   )
-  if(${SQLite3_FOUND})
-    set(sqlite_sources
-        model/sqlite-data-output.cc
+  include_directories(${SQLite3_INCLUDE_DIRS})
+  set(sqlite_libraries
+      ${SQLite3_LIBRARIES}
+  )
+  if(HAVE_SEMAPHORE_H)
+    list(
+      APPEND
+      sqlite_sources
+      model/sqlite-output.cc
     )
-    set(sqlite_headers
-        model/sqlite-data-output.h
-    )
-
-    include_directories(${SQLite3_INCLUDE_DIRS})
-    set(sqlite_libraries
-        ${SQLite3_LIBRARIES}
-    )
-
-    if(HAVE_SEMAPHORE_H)
-      list(
-        APPEND
-        sqlite_sources
-        model/sqlite-output.cc
-      )
-      list(
-        APPEND
-        sqlite_headers
-        model/sqlite-output.h
-      )
-    endif()
-  endif()
-
-  mark_as_advanced(ENABLE_SQLITE)
-  if("${SQLite3_FOUND}")
-    set(ENABLE_SQLITE
-        True
-        CACHE INTERNAL
-              ""
-    )
-  else()
-    set(ENABLE_SQLITE
-        False
-        CACHE INTERNAL
-              ""
+    list(
+      APPEND
+      sqlite_headers
+      model/sqlite-output.h
     )
   endif()
 endif()