From f118873f790b634e855b7b7637a1e837bd578fac Mon Sep 17 00:00:00 2001 From: protomors Date: Sat, 2 Jun 2018 11:01:17 +0300 Subject: CMake: reduced dependency from prebult libraries. --- src/mir_app/CMakeLists.txt | 2 +- src/mir_core/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/mir_app/CMakeLists.txt b/src/mir_app/CMakeLists.txt index e9154b2499..f3a6ca45e5 100644 --- a/src/mir_app/CMakeLists.txt +++ b/src/mir_app/CMakeLists.txt @@ -7,5 +7,5 @@ endif() set(TARGET mir_app) string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) include(${CMAKE_SOURCE_DIR}/cmake/lib.cmake) -target_link_libraries(${TARGET} Zlib FreeImage UxTheme.lib ws2_32.lib) +target_link_libraries(${TARGET} Zlib FreeImage UxTheme.lib ws2_32.lib ${PREBUILT_DIR}/mir_core.lib) set_target_properties(${TARGET} PROPERTIES COMPILE_DEFINITIONS "MIR_APP_EXPORTS") \ No newline at end of file diff --git a/src/mir_core/CMakeLists.txt b/src/mir_core/CMakeLists.txt index d855e7eada..de7f89c588 100644 --- a/src/mir_core/CMakeLists.txt +++ b/src/mir_core/CMakeLists.txt @@ -6,6 +6,6 @@ else() endif() set(TARGET mir_core) include(${CMAKE_SOURCE_DIR}/cmake/lib.cmake) -target_link_libraries(${TARGET} comctl32.lib Wtsapi32.lib) +target_link_libraries(${TARGET} comctl32.lib Wtsapi32.lib ${PREBUILT_DIR}/mir_app.lib) set_target_properties(${TARGET} PROPERTIES COMPILE_DEFINITIONS "MIR_CORE_EXPORTS") add_custom_command(TARGET ${TARGET} PRE_BUILD COMMAND "${CMAKE_SOURCE_DIR}/build/make_ver.bat") \ No newline at end of file -- cgit v1.2.3