diff --git a/cmake/modules/LibraryTarget.cmake b/cmake/modules/LibraryTarget.cmake index aa2f8c0..97c630c 100644 --- a/cmake/modules/LibraryTarget.cmake +++ b/cmake/modules/LibraryTarget.cmake @@ -163,7 +163,8 @@ else () endif () # incorporate the SOVERSION into the library name for mingw-w64 targets - if (BUILD_SHARED_LIBS AND NOT META_IS_PLUGIN + if (BUILD_SHARED_LIBS + AND NOT META_IS_PLUGIN AND MINGW AND VERSIONED_MINGW_LIBRARIES) set_target_properties(${META_TARGET_NAME} PROPERTIES SUFFIX "-${META_SOVERSION}.dll") diff --git a/cmake/modules/WindowsResources.cmake b/cmake/modules/WindowsResources.cmake index 157eac6..d1b8a86 100644 --- a/cmake/modules/WindowsResources.cmake +++ b/cmake/modules/WindowsResources.cmake @@ -56,11 +56,17 @@ endif () # create Windows rc file from template configure_file("${RC_TEMPLATE_FILE}" "${WINDOWS_RC_FILE}-configured.rc") -file(GENERATE OUTPUT "${WINDOWS_RC_FILE}-$.rc" INPUT "${WINDOWS_RC_FILE}-configured.rc") +file( + GENERATE + OUTPUT "${WINDOWS_RC_FILE}-$.rc" + INPUT "${WINDOWS_RC_FILE}-configured.rc") # set windres as resource compiler list(APPEND RES_FILES "${WINDOWS_RC_FILE}-${CMAKE_BUILD_TYPE}.rc") -set_property(SOURCE "${WINDOWS_RC_FILE}-${CMAKE_BUILD_TYPE}.rc" APPEND PROPERTY GENERATED ON) +set_property( + SOURCE "${WINDOWS_RC_FILE}-${CMAKE_BUILD_TYPE}.rc" + APPEND + PROPERTY GENERATED ON) set(CMAKE_RC_COMPILER_INIT windres) set(CMAKE_RC_COMPILE_OBJECT " -O coff -i -o ") enable_language(RC)