From 015039f258b38677f7425ee6878cd0c3bcd8a788 Mon Sep 17 00:00:00 2001 From: "K.Ohta" Date: Mon, 9 Sep 2019 03:33:35 +0900 Subject: [PATCH] [Build][CMAKE] Update SOVERSION. --- source/src/qt/CMakeLists.txt | 7 +++---- source/src/qt/emuutils/CMakeLists.txt | 7 +++++-- source/src/qt/gui/CMakeLists.txt | 3 +-- source/src/vm/fmgen/CMakeLists.txt | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/source/src/qt/CMakeLists.txt b/source/src/qt/CMakeLists.txt index 5dc8f344e..ab78491bd 100644 --- a/source/src/qt/CMakeLists.txt +++ b/source/src/qt/CMakeLists.txt @@ -40,10 +40,9 @@ include (GenerateExportHeader) ) target_link_libraries(CSPosd PUBLIC - PRIVATE ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libCSPemu_utils.dll.a -# ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libCSPgui.dll.a -# ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libqt_avio.a - PUBLIC + PRIVATE ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libCSPemu_utils.dll.a +# INTERFACE ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libCSPgui.dll.a +# ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libCSPavio.dll.a Qt5::Core Qt5::Gui Qt5::OpenGL diff --git a/source/src/qt/emuutils/CMakeLists.txt b/source/src/qt/emuutils/CMakeLists.txt index 8b395eb7b..287f0e7a9 100644 --- a/source/src/qt/emuutils/CMakeLists.txt +++ b/source/src/qt/emuutils/CMakeLists.txt @@ -20,6 +20,7 @@ QT5_WRAP_CPP(s_qt_emuutils_headers_MOC ${s_qt_emuutils_headers}) add_definitions(-D__LIBEMU_UTIL_VERSION=\"libCSPemu_utils.${THIS_LIB_VERSION}\") if(WIN32) + include (GenerateExportHeader) add_library(CSPemu_utils SHARED @@ -27,10 +28,12 @@ add_library(CSPemu_utils SHARED ${s_qt_emuutils_headers_MOC} ) -target_link_libraries(CSPemu_utils PUBLIC +target_link_libraries(CSPemu_utils PRIVATE Qt5::Core - libz.a + libz.dll.a + ${SDL2_LIBRARIES} ) + set_target_properties(CSPemu_utils PROPERTIES SOVERSION ${THIS_LIB_VERSION} VERSION ${THIS_LIB_VERSION} diff --git a/source/src/qt/gui/CMakeLists.txt b/source/src/qt/gui/CMakeLists.txt index 84bc21c87..a0ce88550 100644 --- a/source/src/qt/gui/CMakeLists.txt +++ b/source/src/qt/gui/CMakeLists.txt @@ -157,8 +157,7 @@ add_library(CSPgui SHARED ) target_link_libraries(CSPgui - ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPosd.dll.a -# ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libqt_avio.a + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPosd.dll.a # ${LIBAV_LIBRARIES} ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPavio.dll.a ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPemu_utils.dll.a diff --git a/source/src/vm/fmgen/CMakeLists.txt b/source/src/vm/fmgen/CMakeLists.txt index 047f628be..79e26eac4 100644 --- a/source/src/vm/fmgen/CMakeLists.txt +++ b/source/src/vm/fmgen/CMakeLists.txt @@ -23,7 +23,7 @@ add_library(CSPfmgen SHARED ${s_vm_fmgen_srcs} ) target_link_libraries(CSPfmgen - ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPemu_utils.dll.a + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPemu_utils.dll.a ) set_target_properties(CSPfmgen PROPERTIES SOVERSION ${THIS_LIB_VERSION} -- 2.11.0