Commita78c4ae

committed

Revert "CMake: remove patch version in the avtranscoder library name on Windows"

This reverts commitc6744c1.# Conflicts:#src/CMakeLists.txt

1 parent18cc532 commita78c4aeCopy full SHA for a78c4ae

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ target_link_libraries(avtranscoder-static ${FFMPEG_LIBRARIES})`
`34`	`34`	`add_library(avtranscoder-sharedSHARED${AVTRANSCODER_SRC_FILES})`
`35`	`35`	`set_target_properties(avtranscoder-sharedPROPERTIESLINKER_LANGUAGECXX)`
`36`	`36`	`if(WIN32)`
`37`		`-set_target_properties(avtranscoder-sharedPROPERTIESOUTPUT_NAME"avtranscoder-${AVTRANSCODER_VERSION_MAJOR}.${AVTRANSCODER_VERSION_MINOR}")`
	`37`	`+set_target_properties(avtranscoder-sharedPROPERTIESOUTPUT_NAME"avtranscoder-${AVTRANSCODER_VERSION}")`
`38`	`38`	`else()`
`39`	`39`	`set_target_properties(avtranscoder-sharedPROPERTIESOUTPUT_NAMEavtranscoder)`
`40`	`40`	`endif()`
`@@ -154,7 +154,7 @@ if(SWIG_FOUND)`
`154`	`154`	`# Create 'avtranscoder-java' shared lib`
`155`	`155`	`swig_add_module(avtranscoder-javajava${AVTRANSCODER_BINDING_FILE})`
`156`	`156`	`if(WIN32)`
`157`		`-set_target_properties(avtranscoder-javaPROPERTIESOUTPUT_NAME"avtranscoder-java-${AVTRANSCODER_VERSION_MAJOR}.${AVTRANSCODER_VERSION_MINOR}")`
	`157`	`+set_target_properties(avtranscoder-javaPROPERTIESOUTPUT_NAME"avtranscoder-java-${AVTRANSCODER_VERSION}")`
`158`	`158`	`endif()`
`159`	`159`	`if(NOTAPPLEANDNOTWIN32)`
`160`	`160`	`set_target_properties(${SWIG_MODULE_avtranscoder-java_REAL_NAME}PROPERTIESSOVERSION${AVTRANSCODER_VERSION_MAJOR})`

Comments

(0)