diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ed5a05e0a..e3776b32ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,14 +211,20 @@ endif()
 
 if (WIN32)
     # icu
-    set(ICU_EXTRACT ${CMAKE_CURRENT_SOURCE_DIR}/extern/icu/icu.exe -y)
-    #message("Extracting pre-built ICU")
-    execute_process(COMMAND ${ICU_EXTRACT})
+    if (NOT ICU_EXTRACT)
+        message(STATUS "Extracting pre-built ICU")
+        set(ICU_EXTRACT ${CMAKE_CURRENT_SOURCE_DIR}/extern/icu/icu.exe -y
+            CACHE STRING "ICU extraction variable")
+        execute_process(COMMAND ${ICU_EXTRACT})
+    endif()
 
     # zlib
-    set(ZLIB_EXTRACT ${CMAKE_CURRENT_SOURCE_DIR}/extern/zlib/zlib.exe -y)
-    #message("Extracting pre-built zlib")
-    execute_process(COMMAND ${ZLIB_EXTRACT})
+    if (NOT ZLIB_EXTRACT)
+        message(STATUS "Extracting pre-built zlib")
+        set(ZLIB_EXTRACT ${CMAKE_CURRENT_SOURCE_DIR}/extern/zlib/zlib.exe -y
+            CACHE STRING "zlib extraction variable")
+        execute_process(COMMAND ${ZLIB_EXTRACT})
+    endif()
 endif()
 
 if (UNIX)    
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 58fdb4f5da..c8131ad0fe 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -413,13 +413,13 @@ add_epp_suffix(engine12_generated_src master)
 
 file(GLOB_RECURSE engine12_include "dsql/*.h" "jrd/*.h" include/gen/iberror.h)
 
-add_library                 (engine12_common OBJECT ${engine12_src} ${engine12_include} ${parse_src})
+add_library                 (engine12_common ${engine12_src} ${engine12_include} ${parse_src})
 add_dependencies_cc         (engine12_common parse)
 
 if (NOT CMAKE_CROSSCOMPILING)
 
-add_library                 (boot_engine12 SHARED $<TARGET_OBJECTS:engine12_common> ${engine12_generated_src_boot} ${VERSION_RC})
-target_link_libraries       (boot_engine12 boot_alice boot_burp common boot_yvalve)
+add_library                 (boot_engine12 SHARED ${engine12_generated_src_boot} ${VERSION_RC})
+target_link_libraries       (boot_engine12 engine12_common boot_alice boot_burp common boot_yvalve)
 set_output_directory        (boot_engine12 plugins)
 set_exported_symbols        (boot_engine12 fbplugin)
 copy_and_rename_lib         (boot_engine12 Engine12)
@@ -432,8 +432,8 @@ endif() # if (NOT CMAKE_CROSSCOMPILING)
 # SHARED LIBRARY engine12
 ########################################
 
-add_library                 (engine12 SHARED $<TARGET_OBJECTS:engine12_common> ${engine12_generated_src_master} ${VERSION_RC})
-target_link_libraries       (engine12 alice burp common yvalve)
+add_library                 (engine12 SHARED ${engine12_generated_src_master} ${VERSION_RC})
+target_link_libraries       (engine12 engine12_common alice burp common yvalve)
 add_dependencies_cc         (engine12 messages) # possible build during build_msg or codes run
 set_target_properties       (engine12 PROPERTIES OUTPUT_NAME Engine12)
 set_output_directory        (engine12 plugins)
@@ -724,7 +724,7 @@ endif() # if (NOT CMAKE_CROSSCOMPILING)
 ########################################
 
 add_executable              (gbak burp/main/burpMain.cpp ${gbak_include} ${VERSION_RC})
-target_link_libraries       (gbak burp yvalve common)
+target_link_libraries       (gbak burp common yvalve)
 
 
 ########################################