Skip to content

Improved build compatibility with MSYS2 UCRT #911

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
dylanweber wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Improved build compatibility with MSYS2 UCRT #911

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
59cb6d4
Improved build compatibility with MSYS2 UCRT
Oct 27, 2026
375994d
Updated test compile definition
Oct 27, 2026
2d249cb
Added MSVC check for muting compiler warnings
Oct 27, 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
2 changes: 1 addition & 1 deletion src/bin/keyconv/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if(WITH_BOTAN)
list(APPEND SOURCES softhsm2-keyconv-botan.cpp)
endif(WITH_BOTAN)

if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
if(WIN32)
list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../win32)
list(APPEND SOURCES ${PROJECT_SOURCE_DIR}/../win32/getopt.cpp)
list(APPEND CRYPTO_LIBS "Ws2_32.lib;Crypt32.lib")
Expand Down
2 changes: 1 addition & 1 deletion src/bin/migrate/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if(BUILD_MIGRATE)
${PROJECT_SOURCE_DIR}/../common/library.cpp
)

if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
if(WIN32)
list(APPEND INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/../../lib/win32 ${CMAKE_CURRENT_SOURCE_DIR}/../win32)
list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../win32/getopt.cpp)
endif()
Expand Down
2 changes: 1 addition & 1 deletion src/bin/util/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if(WITH_BOTAN)
list(APPEND SOURCES softhsm2-util-botan.cpp)
endif(WITH_BOTAN)

if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
if(WIN32)
list(APPEND INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/../../lib/win32 ${CMAKE_CURRENT_SOURCE_DIR}/../win32)
list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../win32/getopt.cpp)
endif()
Expand Down
2 changes: 1 addition & 1 deletion src/lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ if(CMAKE_VERSION VERSION_LESS "3.12")
endif()


if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
if(WIN32)
list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/win32)
list(APPEND STATIC_FILES "Ws2_32.lib;Crypt32.lib")
ENDIF()
Expand Down
2 changes: 1 addition & 1 deletion src/lib/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set(SOURCES Configuration.cpp
SimpleConfigLoader.cpp
)

if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
if(WIN32)
list(APPEND SOURCES ${PROJECT_SOURCE_DIR}/../win32/syslog.cpp)
list(APPEND INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/../win32)
ENDIF()
Expand Down
6 changes: 3 additions & 3 deletions src/lib/crypto/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,14 +161,14 @@ if(WITH_BOTAN)
)
endif(WITH_BOTAN)

if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
if(WIN32)
list(APPEND INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/../win32)
ENDIF()

if(WITH_BOTAN)
if(WITH_BOTAN AND CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
# mute botan specific warnings
# https://github.com/randombit/botan/issues/486
list(APPEND COMPILE_OPTIONS "/wd4250;/wd4251;/wd4275;/wd4127;/wd4273")
list(APPEND COMPILE_OPTIONS "/wd4250;/wd4251;/wd4275;/wd4127;/wd4273")
endif()

include_directories(${INCLUDE_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion src/lib/data_mgr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ set(SOURCES ByteString.cpp
SecureMemoryRegistry.cpp
)

if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
if(WIN32)
list(APPEND INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/../win32)
ENDIF()

Expand Down
2 changes: 1 addition & 1 deletion src/lib/handle_mgr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set(SOURCES HandleManager.cpp
Handle.cpp
)

if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
if(WIN32)
list(APPEND INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/../win32)
ENDIF()

Expand Down
2 changes: 1 addition & 1 deletion src/lib/object_store/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ if(WITH_OBJECTSTORE_BACKEND_DB)
)
endif(WITH_OBJECTSTORE_BACKEND_DB)

if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
if(WIN32)
list(APPEND INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/../win32)
endif()

Expand Down
2 changes: 1 addition & 1 deletion src/lib/session_mgr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ set(SOURCES SessionManager.cpp
Session.cpp
)

if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
if(WIN32)
list(APPEND INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/../win32)
endif()

Expand Down
2 changes: 1 addition & 1 deletion src/lib/slot_mgr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set(SOURCES SlotManager.cpp
Token.cpp
)

if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
if(WIN32)
list(APPEND INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/../win32)
ENDIF()

Expand Down
4 changes: 2 additions & 2 deletions src/lib/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ set(SOURCES p11test.cpp
)
add_executable(${PROJECT_NAME} ${SOURCES})

if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
if(WIN32)
Comment thread
dylanweber marked this conversation as resolved.
Resolved
target_sources(${PROJECT_NAME} PRIVATE
${PROJECT_SOURCE_DIR}/../win32/setenv.cpp
${PROJECT_SOURCE_DIR}/../win32/syslog.cpp)
list(APPEND COMPILE_OPTIONS "/DCRYPTOKI_STATIC")
target_compile_definitions(${PROJECT_NAME} PRIVATE CRYPTOKI_STATIC)
else()
target_sources(${PROJECT_NAME} PRIVATE "ForkTests.cpp")
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS -pthread)
Expand Down