[FIX] : fis tests

Author: aiekick

CMakeLists.txt

@@ -8,8 +8,8 @@ enable_language(C CXX)
 option(USE_TESTS "Enable tests" ON)
 option(USE_VISUAL_TESTS "Enable visual tests" ON)
 
-option(USE_DIRENT_FILESYSTEM "Enable the default filesystem with dirent" OFF)
-option(USE_STD_FILESYSTEM "Enable std::filesystem use for path and ImGuiFileDialog" ON)
+option(USE_DIRENT_FILESYSTEM "Enable the default filesystem with dirent" ON)
+option(USE_STD_FILESYSTEM "Enable std::filesystem use for path and ImGuiFileDialog" OFF)
 option(USE_BOOST_FILESYSTEM "Enable the demo of custom filesystem here with boost" OFF)
 
 ## some defines for debug mode (before 3rdparty.cmake)
@@ -223,8 +223,6 @@ target_link_libraries(${PROJECT} PRIVATE
 	ImGuiFileDialog)
 endif()
 
-set_target_properties(ImGuiFileDialog PROPERTIES FOLDER Lib)
-
 target_include_directories(ImGuiFileDialog PRIVATE
 	${CMAKE_CURRENT_SOURCE_DIR}
 )

cmake/glfw.cmake

@@ -6,14 +6,18 @@ set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)
 
 add_subdirectory(${CMAKE_SOURCE_DIR}/3rdparty/glfw)
 
-set_target_properties(glfw PROPERTIES FOLDER 3rdparty) # Override standard 'GLFW3' subfolder
+set_target_properties(glfw PROPERTIES FOLDER 3rdparty/glfw) # Override standard 'GLFW3' subfolder
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     #target_compile_options(glfw PRIVATE "-Wno-everything") 
 else()
     target_compile_options(glfw PRIVATE "-Wno-everything") 
 endif()
 
+if (TARGET update_mappings)
+    set_target_properties(update_mappings PROPERTIES FOLDER 3rdparty/glfw) # Override standard 'GLFW3' subfolder
+endif()
+
 set(GLFW_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/3rdparty/glfw/include)
 set(GLFW_DEFINITIONS -DGLFW_INCLUDE_NONE)
 set(GLFW_LIBRARIES ${GLFW_LIBRARIES} glfw)

tests/ImGuiFileDialog/Test_FileManager.cpp

@@ -2,10 +2,12 @@
 
 #include <cassert>
 
-#include <ImGuiFileDialog/ImGuiFileDialog.h>
+#include <ImGuiFileDialog/ImGuiFileDialog.cpp>
 
 #include <imgui_internal.h>
 
+#include <filesystem>
+
 // specific
 #ifdef WIN32
 #include <direct.h>  // _chdir
@@ -23,9 +25,10 @@ class TestFileManager {
 private:
     FileDialogInternal fd;
     std::set<std::string> arr;
-    std::unique_ptr<IFileSystem> m_FileSystemPtr = nullptr;
+    std::unique_ptr<IFileSystem> m_FileSystemPtr = std::make_unique<FileSystemDirent>();
 
 private:
+
     void m_compute_name_array() {
         for (const auto& file_ptr : fd.fileManager.m_FileList) {
             if (file_ptr) {

tests/main.cpp

@@ -29,7 +29,7 @@ int main(int argc, char** argv) {
         return Test_ImGuiFileDialog(argv[1]) ? 0 : 1;
     }
 
-    return Test_ImGuiFileDialog("Test_IGFD_Utils_NaturalCompare_5") ? 0 : 1;
+    return Test_ImGuiFileDialog("Test_IGFD_FileManager_Filtering_asterisk_0") ? 0 : 1;
 
     return 0;
 }