Skip to content

Add BUILD_WITH_DEFAULT_MSVC_RUNTIME_LIBRARY option #22

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

Closed
wants to merge 2 commits into from
Closed

Add BUILD_WITH_DEFAULT_MSVC_RUNTIME_LIBRARY option #22

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b26c01
Add BUILD_WITH_DEFAULT_MSVC_RUNTIME_LIBRARY option
traversaro Nov 13, 2024
3e1987a
Update CMakeLists.txt
traversaro Nov 13, 2024
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
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ option(BUILD_MCMODELLARGE "Build the library linked with mcmodel=large flag, use
option(BUILD_LICCHECK_PRINT "Build libraries with licence check flag" OFF)
option(BUILD_DYNRT_LIBS "Build the libraries linked against the dynamic runtime (windows only)" OFF)
option(BUILD_MT_LIBS "Build the multithreaded library" OFF)
option(BUILD_WITH_DEFAULT_MSVC_RUNTIME_LIBRARY "If ON, do not manually set MSVC_RUNTIME_LIBRARY property" OFF)
mark_as_advanced(BUILD_WITH_DEFAULT_MSVC_RUNTIME_LIBRARY)
option(BUILD_CPP "Build the cpp interface" OFF)
option(BUILD_F2C "Build the f2c library" OFF)
if (${CMAKE_VERSION} VERSION_LESS "3.9.0")
Expand Down Expand Up @@ -346,14 +348,16 @@ macro(createSingleASL name sourcedir sources)
if(NOT WIN32)
target_link_libraries(${name} PRIVATE m)
endif()
if(MSVC)
if(MSVC AND NOT BUILD_WITH_DEFAULT_MSVC_RUNTIME_LIBRARY)
if(${name} MATCHES "dynrt")
set_property(TARGET ${name} PROPERTY
MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
else()
set_property(TARGET ${name} PROPERTY
MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
endif()
endif()
if(MSVC)
target_compile_options(${name} PRIVATE
/wd4013 /wd4018 /wd4101 /wd4244 /wd4273 /wd4267 /wd4996)
else()
Expand Down
Loading