Merge branch 'main' of https://www.sinxmiao.cn/taynpg/ofen

CMakeLists.txt

@@ -31,8 +31,8 @@ if(DEFINED USE_TEST)
     enable_testing()
     add_subdirectory(test)
 endif()
-if(DEFINED MINGW32_XP_BOOST)
-message(STATUS "ofen use mingw32 xp boost.")
+if(DEFINED USE_BOOST)
+message(STATUS "ofen use boost lib.")
 include_directories(${MBOOST_INCLUDE_DIR})
 link_directories(${MBOOST_LIB_DIR})
 endif()
@@ -42,7 +42,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE})
 
 add_library(ofen STATIC ${SRC_FILES})
 target_include_directories(ofen PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/3rd)
-if(DEFINED MINGW32_XP_BOOST)
+if(DEFINED USE_BOOST)
 target_link_directories(ofen PRIVATE ${MBOOST_LIB_DIR})
 target_link_libraries(ofen PRIVATE ${MBOOST_LIBS})
 endif()

src/of_path.cpp

@@ -3,7 +3,7 @@
 #include <fstream>
 #include <regex>
 
-#ifdef MINGW32_XP_BOOST
+#ifdef USE_BOOST
 #include <boost/filesystem.hpp>
 namespace fs = boost::filesystem;
 #else