From 7f37eac04cdd775ddae46de462d10d104411379f Mon Sep 17 00:00:00 2001 From: Yusuke Sasaki Date: Thu, 16 Jun 2016 21:34:36 +0900 Subject: [PATCH 1/2] switch suffix of import library between MSVC and MinGW --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b5ad84f..27b8c9f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -167,7 +167,11 @@ ADD_LIBRARY (msgpackc-static STATIC SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc") IF (MSGPACK_ENABLE_SHARED) - SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX "_import.lib") + IF (MSVC) + SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX "_import.lib") + ELSEIF (MINGW) + SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX ".dll.a") + ENDIF () SET_TARGET_PROPERTIES (msgpackc PROPERTIES SOVERSION 2 VERSION 2.0.0) ENDIF () From edc8004985ffb1c9f95bea9b6411c3dfa1d74955 Mon Sep 17 00:00:00 2001 From: Yusuke Sasaki Date: Thu, 16 Jun 2016 21:36:35 +0900 Subject: [PATCH 2/2] avoid to install DLLs in lib/ --- CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 27b8c9f3..b951296d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -220,6 +220,10 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC90" OR "${CMAKE_CXX_COMPILER_ID}" S SET_SOURCE_FILES_PROPERTIES(${msgpackc_SOURCES} PROPERTIES LANGUAGE CXX) ENDIF() +IF (NOT DEFINED CMAKE_INSTALL_BINDIR) + SET(CMAKE_INSTALL_BINDIR bin) +ENDIF () + IF (NOT DEFINED CMAKE_INSTALL_LIBDIR) SET(CMAKE_INSTALL_LIBDIR lib) ENDIF () @@ -234,7 +238,9 @@ ELSE() SET (MSGPACK_INSTALLTARGETS msgpackc-static) ENDIF () -INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} DESTINATION ${CMAKE_INSTALL_LIBDIR}) +INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) INSTALL (DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX}) IF (NOT MSVC) INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)