Skip to content

Fix clang-cl detection and add LIBPL_WARNINGS_AS_ERRORS #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mrexodia wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix clang-cl detection and add LIBPL_WARNINGS_AS_ERRORS #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dec107f
Fix clang-cl detection and add LIBPL_WARNINGS_AS_ERRORS
mrexodia Apr 14, 2026
3a46e6e
Downgrade requirement to C++20
mrexodia Apr 14, 2026
a012b8e
Fix deprecated CRT warnings on MSVC
mrexodia Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
cmake_minimum_required(VERSION 3.20)
cmake_minimum_required(VERSION 3.21)
project(PatternLanguage)

set(CMAKE_CXX_STANDARD 23)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

option(LIBPL_SHARED_LIBRARY "Compile the library as a shared library" OFF)
option(LIBPL_WARNINGS_AS_ERRORS "Treat warnings as errors" ${PROJECT_IS_TOP_LEVEL})
option(LIBPL_ENABLE_TESTS "Enable testing" OFF)
option(LIBPL_ENABLE_CLI "Enable building the CLI tool" ON)
option(LIBPL_BUILD_CLI_AS_EXECUTABLE "Build the CLI tool as an executable" ON)
Expand Down
11 changes: 9 additions & 2 deletions cli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,15 @@ else()
find_package(CLI11 CONFIG QUIET)
endif()

if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
target_compile_options(plcli PRIVATE -Wall -Wextra -Werror -Wno-unknown-pragmas -Wno-array-bounds)
if(MSVC)
if (LIBPL_WARNINGS_AS_ERRORS)
target_compile_options(plcli PRIVATE /WX)
endif()
elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
target_compile_options(plcli PRIVATE -Wall -Wextra -Wno-unknown-pragmas -Wno-array-bounds)
if (LIBPL_WARNINGS_AS_ERRORS)
target_compile_options(plcli PRIVATE -Werror)
endif()
endif()
target_include_directories(plcli PUBLIC include ${CLI11_INCLUDE_DIRS})
target_link_libraries(plcli PRIVATE ${CLI11_LIBRARIES} ${NLOHMANN_JSON_LIBRARIES} libwolv libpl_includes libpl-gen ${FMT_LIBRARIES})
Expand Down
10 changes: 8 additions & 2 deletions lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,16 @@ if (LIBPL_ENABLE_PRECOMPILED_HEADERS)
)
endif ()

if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
if (MSVC)
target_compile_options(libpl PRIVATE /EHsc)
if (LIBPL_WARNINGS_AS_ERRORS)
target_compile_options(libpl PRIVATE /WX)
endif()
elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
target_compile_options(libpl PRIVATE -Wall -Wextra -Werror -Wpedantic -Wno-unknown-pragmas -Wno-array-bounds)
target_compile_options(libpl PRIVATE -Wall -Wextra -Wpedantic -Wno-unknown-pragmas -Wno-array-bounds)
if (LIBPL_WARNINGS_AS_ERRORS)
target_compile_options(libpl PRIVATE -Werror)
endif()
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
target_compile_options(libpl PRIVATE -Wno-stringop-overflow)
endif()
Expand Down
14 changes: 14 additions & 0 deletions lib/source/pl/lib/std/time.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,15 @@ namespace pl::lib::libstd::time {
auto time = time_t(params[0].toUnsigned());

try {
#ifdef _MSC_VER
std::tm localTimeBuf{};
if(localtime_s(&localTimeBuf, &time) != 0)
return u128(0);
auto localTime = &localTimeBuf;
#else
auto localTime = std::localtime(&time);
if (localTime == nullptr) return u128(0);
#endif // _MSC_VER

return { packTMValue(*localTime, runtime) };
} catch (const fmt::format_error&) {
Expand All @@ -81,8 +88,15 @@ namespace pl::lib::libstd::time {
auto time = time_t(params[0].toUnsigned());

try {
#ifdef _MSC_VER
std::tm gmTimeBuf{};
if(gmtime_s(&gmTimeBuf, &time) != 0)
return u128(0);
auto gmTime = &gmTimeBuf;
#else
auto gmTime = std::gmtime(&time);
if (gmTime == nullptr) return u128(0);
#endif // _MSC_VER

return { packTMValue(*gmTime, runtime) };
} catch (const fmt::format_error&) {
Expand Down
Loading