Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 07:36:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE] Replace custom functions to built-in ones

Browse source 
add_target_compile_definitions -> target_compile_definitions
add_target_compile_flags -> target_compile_options
add_target_include_directories -> target_include_directories
This commit is contained in:
Victor Perevertkin 2020-04-16 15:59:38 +03:00
parent 480f729f6d
commit 7e069ccdb2
No known key found for this signature in database
GPG key ID: C750B7222E9C7830
93 changed files with 163 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/rosapps/applications/devutils/symdump/CMakeLists.txt
View file

@ -5,6 +5,6 @@ set_module_type(symdump win32cui)
target_link_libraries(symdump wine)
add_importlibs(symdump dbghelp shlwapi msvcrt kernel32 ntdll)
if(NOT MSVC)
add_target_compile_flags(symdump "-Wno-unused-but-set-variable")
target_compile_options(symdump PRIVATE "-Wno-unused-but-set-variable")
endif()
add_cd_file(TARGET symdump DESTINATION reactos/system32 FOR all)

2
modules/rosapps/applications/fraginator/CMakeLists.txt
View file

@ -17,7 +17,7 @@ add_importlibs(frag user32 advapi32 shell32 comctl32 msvcrt kernel32 ntdll)
add_cd_file(TARGET frag DESTINATION reactos/system32 FOR all)
add_executable(unfrag ${UNFRAG_SOURCE})
add_target_compile_definitions(unfrag "_CUI_")
target_compile_definitions(unfrag PRIVATE "_CUI_")
set_module_type(unfrag win32cui UNICODE)
add_importlibs(unfrag advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET unfrag DESTINATION reactos/system32 FOR all)

5
modules/rosapps/applications/net/ncftp/CMakeLists.txt
View file

@ -70,10 +70,9 @@ list(APPEND SOURCE
add_executable(ncftp ${SOURCE} ncftp.rc)
set_module_type(ncftp win32cui)
target_compile_definitions(ncftp PRIVATE HAVE_UTIME_H HAVE_UNISTD_H)
if(NOT MSVC)
add_target_compile_flags(ncftp "-DHAVE_UTIME_H -DHAVE_UNISTD_H -Wno-unused-but-set-variable")
else()
add_target_compile_flags(ncftp "-DHAVE_UTIME_H -DHAVE_UNISTD_H")
target_compile_options(ncftp PRIVATE -Wno-unused-but-set-variable)
endif()
add_importlibs(ncftp advapi32 user32 ws2_32 msvcrt kernel32)
add_cd_file(TARGET ncftp DESTINATION reactos/system32 FOR all)

2
modules/rosapps/applications/sysutils/logevent/CMakeLists.txt
View file

@ -2,7 +2,7 @@
add_executable(logevent logevent.c logevent.rc)
set_module_type(logevent win32cui)
if(NOT MSVC)
add_target_compile_flags(logevent "-Wno-unused-but-set-variable")
target_compile_options(logevent PRIVATE "-Wno-unused-but-set-variable")
endif()
add_importlibs(logevent advapi32 msvcrt kernel32)
add_cd_file(TARGET logevent DESTINATION reactos/system32 FOR all)

2
modules/rosapps/applications/sysutils/pedump/CMakeLists.txt
View file

@ -2,7 +2,7 @@
add_executable(pedump pedump.c pedump.rc)
set_module_type(pedump win32cui)
if(NOT MSVC)
add_target_compile_flags(pedump "-Wno-unused-but-set-variable")
target_compile_options(pedump PRIVATE "-Wno-unused-but-set-variable")
endif()
add_importlibs(pedump msvcrt kernel32 ntdll)
add_cd_file(TARGET pedump DESTINATION reactos/system32 FOR all)

2
modules/rosapps/applications/sysutils/utils/rosperf/CMakeLists.txt
View file

@ -12,7 +12,7 @@ list(APPEND SOURCE
add_executable(rosperf ${SOURCE} rosperf.rc)
set_module_type(rosperf win32cui UNICODE)
if(NOT MSVC)
add_target_compile_flags(rosperf "-Wno-unused-but-set-variable")
target_compile_options(rosperf PRIVATE "-Wno-unused-but-set-variable")
endif()
add_importlibs(rosperf version msimg32 gdi32 shell32 advapi32 user32 ntdll msvcrt kernel32)
add_cd_file(TARGET rosperf DESTINATION reactos/system32 FOR all)

2
modules/rosapps/applications/winfile/CMakeLists.txt
View file

@ -9,5 +9,5 @@ add_cd_file(TARGET winefile DESTINATION reactos/system32 FOR all)
#if(NOT MSVC)
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
# add_target_compile_flags(winefile "-Wno-format")
# target_compile_options(winefile PRIVATE "-Wno-format")
#endif()