[USETUP] Use the smaller zlib_solo instead of the full zlib. CORE-14290

[reactos.git] / base / setup / usetup / CMakeLists.txt

diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt
index b6125f5..46034af 100644 (file)
--- a/base/setup/usetup/CMakeLists.txt
+++ b/base/setup/usetup/CMakeLists.txt
@@ -3,9 +3,9 @@ add_definitions(${I18N_DEFS})
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${REACTOS_SOURCE_DIR}/lib/inflib
-    ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib
-    ${REACTOS_SOURCE_DIR}/include/reactos/drivers)
+    ${REACTOS_SOURCE_DIR}/sdk/lib/inflib
+    ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib
+    ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers)
 
 list(APPEND SOURCE
     interface/usetup.c
@@ -18,6 +18,7 @@ list(APPEND SOURCE
     bootsup.c
     cabinet.c
     chkdsk.c
+    cmdcons.c
     drivesup.c
     filesup.c
     filequeue.c
@@ -33,13 +34,13 @@ list(APPEND SOURCE
     settings.c
     usetup.h)
 
-if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
-    #FIXME: Investigate Clang "illegal character encoding in string literal" warning
-    set_property(SOURCE mui.c APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-invalid-source-encoding")
+add_executable(usetup ${SOURCE} usetup.rc)
+
+if(USE_CLANG_CL)
+    add_target_compile_flags(usetup "-Wno-invalid-source-encoding")
 endif()
 
-add_executable(usetup ${SOURCE} usetup.rc)
-target_link_libraries(usetup zlib inflib ext2lib vfatlib)
+target_link_libraries(usetup zlib_solo inflib ext2lib vfatlib)
 set_module_type(usetup nativecui)
 add_importlibs(usetup ntdll)
 add_pch(usetup usetup.h SOURCE)