From 2651b01535bb7aa01b07865505fa3a2fe13600bf Mon Sep 17 00:00:00 2001 From: DigitalBox98 Date: Wed, 5 Mar 2025 19:47:24 +0000 Subject: Patch testing part diff --git a/test/render_test.cpp b/test/render_test.cpp index 4c5c7aa..93cc878 100644 --- a/test/render_test.cpp +++ b/test/render_test.cpp @@ -10,6 +10,13 @@ #include "../containers/test/Bitmap.h" using namespace std; +#include +#include +#include +#include +#include +#include + vector find_htm_files(); void test(string filename); @@ -28,28 +35,41 @@ INSTANTIATE_TEST_SUITE_P(, render_test, testing::ValuesIn(find_htm_files())); void error(const char* msg) { puts(msg); exit(1); } -void read_dir(const string& subdir, vector& files) +void read_dir(const std::string& subdir, std::vector& files) { - string full_path = string(test_dir) + "/" + subdir; - DIR* dir = opendir(full_path.c_str()); - if (!dir) error(full_path.c_str()); - while (dirent* ent = readdir(dir)) - { - string name = ent->d_name; - if (ent->d_type == DT_DIR) - { - if(name != "." && name != ".." && name[0] != '-') - { - read_dir(subdir + "/" + name, files); - } - } else if (ent->d_type == DT_REG) - { - if (name[0] != '-' && name.size() > 4 && - (name.substr(name.size() - 4) == ".htm" || name.substr(name.size() - 5) == ".html")) - files.push_back(subdir + "/" + name); - } - } - closedir(dir); + std::string full_path = std::string(test_dir) + "/" + subdir; + DIR* dir = opendir(full_path.c_str()); + if (!dir) { + error(full_path.c_str()); + return; + } + + struct dirent* ent; + while ((ent = readdir(dir)) != nullptr) + { + std::string name = ent->d_name; + if (name == "." || name == ".." || name[0] == '-') + continue; + + std::string entry_path = full_path + "/" + name; + struct stat st; + if (stat(entry_path.c_str(), &st) != 0) + continue; // Impossible d'obtenir les infos, on ignore + + if (S_ISDIR(st.st_mode)) + { + read_dir(subdir + "/" + name, files); + } + else if (S_ISREG(st.st_mode)) + { + if (name.size() > 4 && + (name.substr(name.size() - 4) == ".htm" || name.substr(name.size() - 5) == ".html")) + { + files.push_back(subdir + "/" + name); + } + } + } + closedir(dir); } vector find_htm_files() -- 2.45.2 From 81cd83747142fc8dc4470cd582996df411394882 Mon Sep 17 00:00:00 2001 From: DigitalBox98 Date: Thu, 6 Mar 2025 08:33:51 +0000 Subject: Fix cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 595689f..99ccc3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,7 +173,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES target_include_directories(${PROJECT_NAME} PUBLIC $ $ - $) + $ Date: Thu, 6 Mar 2025 19:55:01 +0000 Subject: Fix2 cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 99ccc3e..abc6d04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,8 +173,9 @@ set_target_properties(${PROJECT_NAME} PROPERTIES target_include_directories(${PROJECT_NAME} PUBLIC $ $ - $ +) +target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME}) # Gumbo target_link_libraries(${PROJECT_NAME} PUBLIC gumbo) @@ -182,13 +183,13 @@ target_link_libraries(${PROJECT_NAME} PUBLIC gumbo) # install and export install(TARGETS ${PROJECT_NAME} EXPORT litehtmlTargets - RUNTIME DESTINATION bin COMPONENT libraries - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT libraries - LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT libraries - PUBLIC_HEADER DESTINATION include/litehtml + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/litehtml ) -install(FILES cmake/litehtmlConfig.cmake DESTINATION lib${LIB_SUFFIX}/cmake/litehtml) -install(EXPORT litehtmlTargets FILE litehtmlTargets.cmake DESTINATION lib${LIB_SUFFIX}/cmake/litehtml) +install(FILES cmake/litehtmlConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/litehtml) +install(EXPORT litehtmlTargets FILE litehtmlTargets.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/litehtml) # Tests -- 2.45.2 From aaece72076f1d7efd5ace908e84e919700cbfb2a Mon Sep 17 00:00:00 2001 From: DigitalBox98 Date: Thu, 6 Mar 2025 22:48:41 +0000 Subject: Fix gumbo diff --git a/src/gumbo/CMakeLists.txt b/src/gumbo/CMakeLists.txt index 17843c9..1a3954a 100644 --- a/src/gumbo/CMakeLists.txt +++ b/src/gumbo/CMakeLists.txt @@ -60,9 +60,10 @@ endif() # Export gumbo includes. target_include_directories(${PROJECT_NAME} PUBLIC - $ - $) -target_include_directories(${PROJECT_NAME} PRIVATE include/gumbo) + $ + $ +) +target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/gumbo) # install and export install(TARGETS ${PROJECT_NAME} @@ -70,6 +71,6 @@ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin COMPONENT libraries ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT libraries LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT libraries - PUBLIC_HEADER DESTINATION include/gumbo + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gumbo ) -install(EXPORT gumbo FILE gumboConfig.cmake DESTINATION lib${LIB_SUFFIX}/cmake/gumbo) +install(EXPORT gumbo FILE gumboConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/gumbo) -- 2.45.2 From fcfb9357904745b7b1cccad7f7a30baf3922456c Mon Sep 17 00:00:00 2001 From: DigitalBox98 Date: Thu, 6 Mar 2025 23:23:29 +0000 Subject: Fix2 gumbo diff --git a/src/gumbo/CMakeLists.txt b/src/gumbo/CMakeLists.txt index 1a3954a..bbeca1a 100644 --- a/src/gumbo/CMakeLists.txt +++ b/src/gumbo/CMakeLists.txt @@ -68,9 +68,9 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/i # install and export install(TARGETS ${PROJECT_NAME} EXPORT gumbo - RUNTIME DESTINATION bin COMPONENT libraries - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT libraries - LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT libraries + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gumbo ) install(EXPORT gumbo FILE gumboConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/gumbo) -- 2.45.2