diff options
author | Chad Elliott <elliottc@objectcomputing.com> | 2023-01-05 09:55:27 -0600 |
---|---|---|
committer | Chad Elliott <elliottc@objectcomputing.com> | 2023-01-05 09:55:27 -0600 |
commit | 36c558c30b842c6b6f70b62a8736c35077b2f093 (patch) | |
tree | 271eff8515766f50253714b716d05d74294923f2 /ACE/bin | |
parent | 6756ee16851ac1daa006f1b30b8987bd03a9c42e (diff) | |
download | ATCD-36c558c30b842c6b6f70b62a8736c35077b2f093.tar.gz |
Adds the ability to build ACE core libraries, gperf, and possibly others using CMake.
Diffstat (limited to 'ACE/bin')
-rw-r--r-- | ACE/bin/MakeProjectCreator/config/acedefaults.mpb | 6 | ||||
-rw-r--r-- | ACE/bin/MakeProjectCreator/config/vc_warnings.mpb | 20 |
2 files changed, 26 insertions, 0 deletions
diff --git a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb index bc94d321425..c90509cecf5 100644 --- a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb +++ b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb @@ -18,6 +18,12 @@ project: ipv6, vc_warnings, build_files, test_files, svc_conf_files, ace_unicode specific(prop:windows) { lit_libs += iphlpapi } + verbatim(cmake, top, 1) { + set(ACE_ROOT $ENV{ACE_ROOT}) + if(WIN32) + " link_libraries(iphlpapi)" + endif() + } specific(cdt6) { win32::platform_libs += ws2_32 mswsock netapi32 diff --git a/ACE/bin/MakeProjectCreator/config/vc_warnings.mpb b/ACE/bin/MakeProjectCreator/config/vc_warnings.mpb index a98185375e1..b951e280931 100644 --- a/ACE/bin/MakeProjectCreator/config/vc_warnings.mpb +++ b/ACE/bin/MakeProjectCreator/config/vc_warnings.mpb @@ -11,24 +11,44 @@ feature(vc_avoid_crt_secure_warnings) { specific(prop:microsoft) { macros += _CRT_SECURE_NO_WARNINGS _CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_DEPRECATE } + verbatim(cmake, macros, 1) { + if(MSVC) + " add_compile_definitions(_CRT_SECURE_NO_WARNINGS _CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_DEPRECATE)" + endif() + } } feature(!vc_scl_secure_warnings) { specific(prop:microsoft) { macros += _SCL_SECURE_NO_WARNINGS } + verbatim(cmake, macros, 1) { + if(MSVC) + " add_compile_definitions(_SCL_SECURE_NO_WARNINGS)" + endif() + } } feature(vc_avoid_this_in_initializer_warnings) { specific(prop:microsoft) { DisableSpecificWarnings += 4355 } + verbatim(cmake, macros, 1) { + if(MSVC) + " add_compile_options(/wd4355)" + endif() + } } feature(vc_avoid_winsock_warnings) { specific(prop:microsoft) { macros += _WINSOCK_DEPRECATED_NO_WARNINGS } + verbatim(cmake, macros, 1) { + if(MSVC) + " add_compile_definitions(_WINSOCK_DEPRECATED_NO_WARNINGS)" + endif() + } } feature(vc_avoid_hides_local_declaration) { |