mirror of
https://github.com/SFML/SFML.git
synced 2024-11-25 04:41:05 +08:00
Changed the naming rules for SFML 2 libraries: the major version number no longer appears in them, except for Windows DLLs (not in import libraries)
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1609 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
parent
5232a66eb3
commit
7c20d648fc
@ -103,8 +103,16 @@ macro(sfml_add_library target)
|
|||||||
|
|
||||||
# adjust the output file prefix/suffix to match our conventions
|
# adjust the output file prefix/suffix to match our conventions
|
||||||
if(BUILD_SHARED_LIBS)
|
if(BUILD_SHARED_LIBS)
|
||||||
|
if(WINDOWS)
|
||||||
|
# include the major version number in Windows shared library names (but not import library names)
|
||||||
set_target_properties(${target} PROPERTIES DEBUG_POSTFIX -d)
|
set_target_properties(${target} PROPERTIES DEBUG_POSTFIX -d)
|
||||||
|
set_target_properties(${target} PROPERTIES SUFFIX "-${VERSION_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
||||||
|
else()
|
||||||
|
set_target_properties(${target} PROPERTIES DEBUG_POSTFIX -d)
|
||||||
|
endif()
|
||||||
if (WINDOWS AND COMPILER_GCC)
|
if (WINDOWS AND COMPILER_GCC)
|
||||||
|
# on Windows/gcc get rid of "lib" prefix for shared libraries,
|
||||||
|
# and transform the ".dll.a" suffix into ".a" for import libraries
|
||||||
set_target_properties(${target} PROPERTIES PREFIX "")
|
set_target_properties(${target} PROPERTIES PREFIX "")
|
||||||
set_target_properties(${target} PROPERTIES IMPORT_SUFFIX ".a")
|
set_target_properties(${target} PROPERTIES IMPORT_SUFFIX ".a")
|
||||||
endif()
|
endif()
|
||||||
@ -117,10 +125,6 @@ macro(sfml_add_library target)
|
|||||||
set_target_properties(${target} PROPERTIES SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR})
|
set_target_properties(${target} PROPERTIES SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR})
|
||||||
set_target_properties(${target} PROPERTIES VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
|
set_target_properties(${target} PROPERTIES VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
|
||||||
|
|
||||||
# insert the major version number in the output filename
|
|
||||||
string(REGEX REPLACE "sfml(-.*)" "sfml${VERSION_MAJOR}\\1" OUTPUT_NAME ${target})
|
|
||||||
set_target_properties(${target} PROPERTIES OUTPUT_NAME ${OUTPUT_NAME})
|
|
||||||
|
|
||||||
# for gcc 4.x on Windows, we add the -static-libgcc linker flag to get rid of an extra gcc DLL
|
# for gcc 4.x on Windows, we add the -static-libgcc linker flag to get rid of an extra gcc DLL
|
||||||
if(WINDOWS AND COMPILER_GCC)
|
if(WINDOWS AND COMPILER_GCC)
|
||||||
if(${GCC_VERSION} MATCHES "4\\..*")
|
if(${GCC_VERSION} MATCHES "4\\..*")
|
||||||
|
Loading…
Reference in New Issue
Block a user