- Notifications
You must be signed in to change notification settings - Fork50
CMake: remove patch version in the avtranscoder library name on Windows#288
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Changes fromall commits
File filter
Filter by extension
Conversations
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -34,7 +34,7 @@ target_link_libraries(avtranscoder-static ${FFMPEG_LIBRARIES}) | ||
| add_library(avtranscoder-shared SHARED ${AVTRANSCODER_SRC_FILES}) | ||
| set_target_properties(avtranscoder-shared PROPERTIES LINKER_LANGUAGE CXX) | ||
| if(WIN32) | ||
| set_target_properties(avtranscoder-shared PROPERTIES OUTPUT_NAME "avtranscoder-${AVTRANSCODER_VERSION_MAJOR}-${AVTRANSCODER_VERSION_MINOR}") | ||
| else() | ||
| set_target_properties(avtranscoder-shared PROPERTIES OUTPUT_NAME avtranscoder) | ||
| endif() | ||
| @@ -154,7 +154,7 @@ if(SWIG_FOUND) | ||
| # Create 'avtranscoder-java' shared lib | ||
| swig_add_module(avtranscoder-java java ${AVTRANSCODER_BINDING_FILE}) | ||
| if(WIN32) | ||
| set_target_properties(avtranscoder-java PROPERTIES OUTPUT_NAME "avtranscoder-java-${AVTRANSCODER_VERSION_MAJOR}-${AVTRANSCODER_VERSION_MINOR}") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. The generated JAR name should be changed too, no? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Yes you are right! MemberAuthor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Arg it does not seems to be a good idea, since widely used Java tools, like Maven, expects Jar namednameJar-fullVersion.jar. We need to take some time to discuss about this possible update... | ||
| endif() | ||
| if(NOT APPLE AND NOT WIN32) | ||
| set_target_properties(${SWIG_MODULE_avtranscoder-java_REAL_NAME} PROPERTIES SOVERSION ${AVTRANSCODER_VERSION_MAJOR}) | ||