mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Fixed library naming

Browse Source 
Don't add version suffix to library names.
This commit is contained in:
Bernhard Miklautz 2012-11-19 16:21:37 +01:00
parent f5308c2005
commit b23109d01b
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -42,11 +42,7 @@ set(FREERDP_VERSION_MINOR "0")
set(FREERDP_VERSION_REVISION "2")
set(FREERDP_VERSION_SUFFIX "rc1")
set(FREERDP_VERSION "${FREERDP_VERSION_MAJOR}.${FREERDP_VERSION_MINOR}")
if (FREERDP_VERSION_SUFFIX)
set(FREERDP_VERSION_FULL "${FREERDP_VERSION}.${FREERDP_VERSION_REVISION}-${FREERDP_VERSION_SUFFIX}")
else()
set(FREERDP_VERSION_FULL "${FREERDP_VERSION}.${FREERDP_VERSION_REVISION}")
endif()
set(FREERDP_VERSION_FULL "${FREERDP_VERSION}.${FREERDP_VERSION_REVISION}")
# Default to release build type

5
libfreerdp-utils/args.c
View File

@ -664,7 +664,10 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
}
else if (strcmp("--version", argv[index]) == 0)
{
printf("This is FreeRDP version %s\n", FREERDP_VERSION_FULL);
if (strlen(FREERDP_VERSION_SUFFIX))
printf("This is FreeRDP version %s-%s\n", FREERDP_VERSION_FULL, FREERDP_VERSION_SUFFIX);
else
printf("This is FreeRDP version %s\n", FREERDP_VERSION_FULL);
return FREERDP_ARGS_PARSE_VERSION;
}
else if (argv[index][0] != '-')