build:restore linux build default non-cpm behavior for tzdb discord-rpc

externals/CMakeLists.txt

@@ -142,6 +142,14 @@ endif()
 # DiscordRPC
 if (USE_DISCORD_PRESENCE AND NOT TARGET DiscordRPC::discord-rpc)
     set(BUILD_EXAMPLES OFF)
+    # Help discord-rpc find RapidJSON if it's installed in the system
+    if (NOT RAPIDJSON AND NOT CITRON_USE_CPM)
+        find_path(RAPIDJSON_INCLUDE_DIR NAMES rapidjson/document.h)
+        if (RAPIDJSON_INCLUDE_DIR)
+            get_filename_component(RAPIDJSON_BASE_DIR "${RAPIDJSON_INCLUDE_DIR}" DIRECTORY)
+            set(RAPIDJSON "${RAPIDJSON_BASE_DIR}" CACHE PATH "Path to RapidJSON")
+        endif()
+    endif()
     if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/discord-rpc/CMakeLists.txt")
         add_subdirectory(discord-rpc)
         target_include_directories(discord-rpc INTERFACE ./discord-rpc/include)

externals/nx_tzdb/CMakeLists.txt

@@ -52,13 +52,20 @@ if ((NOT CAN_BUILD_NX_TZDB OR CITRON_DOWNLOAD_TIME_ZONE_DATA) AND NOT EXISTS ${N
         DESTINATION
             ${NX_TZDB_ROMFS_DIR})
 elseif (CAN_BUILD_NX_TZDB AND NOT CITRON_DOWNLOAD_TIME_ZONE_DATA)
-    if (DEFINED TZDB_TO_NX_SOURCE_DIR AND EXISTS "${TZDB_TO_NX_SOURCE_DIR}/CMakeLists.txt")
+    if (NOT DEFINED TZDB_TO_NX_SOURCE_DIR)
+        set(TZDB_TO_NX_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tzdb_to_nx")
+    endif()
+
+    if (EXISTS "${TZDB_TO_NX_SOURCE_DIR}/CMakeLists.txt")
         add_subdirectory("${TZDB_TO_NX_SOURCE_DIR}" tzdb_to_nx)
     else()
         message(FATAL_ERROR "tzdb_to_nx source not found. Enable CITRON_USE_CPM so the source can be fetched.")
     endif()
     add_dependencies(nx_tzdb x80e)
 
+    if (NOT NX_TZDB_DIR)
+        set(NX_TZDB_DIR "${CMAKE_CURRENT_BINARY_DIR}/tzdb_to_nx/src/tzdb/nx")
+    endif()
     set(NX_TZDB_ROMFS_DIR "${NX_TZDB_DIR}")
 endif()