mirror of
https://github.com/SFML/SFML.git
synced 2024-11-25 04:41:05 +08:00
Do not install extlibs if SFML_USE_SYSTEM_DEPS is true.
Signed-off-by: Marty Plummer <ntzrmtthihu777@gmail.com>
This commit is contained in:
parent
c43b5991af
commit
bd479c4454
@ -408,24 +408,26 @@ endif()
|
|||||||
# install 3rd-party libraries and tools
|
# install 3rd-party libraries and tools
|
||||||
if(SFML_OS_WINDOWS)
|
if(SFML_OS_WINDOWS)
|
||||||
|
|
||||||
# install the binaries of SFML dependencies
|
if(NOT SFML_USE_SYSTEM_DEPS)
|
||||||
if(ARCH_32BITS)
|
# install the binaries of SFML dependencies
|
||||||
install(DIRECTORY extlibs/bin/x86/ DESTINATION bin)
|
if(ARCH_32BITS)
|
||||||
if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14)
|
install(DIRECTORY extlibs/bin/x86/ DESTINATION bin)
|
||||||
install(DIRECTORY extlibs/libs-msvc/x86/ DESTINATION lib)
|
if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14)
|
||||||
elseif(SFML_COMPILER_MSVC)
|
install(DIRECTORY extlibs/libs-msvc/x86/ DESTINATION lib)
|
||||||
install(DIRECTORY extlibs/libs-msvc-universal/x86/ DESTINATION lib)
|
elseif(SFML_COMPILER_MSVC)
|
||||||
else()
|
install(DIRECTORY extlibs/libs-msvc-universal/x86/ DESTINATION lib)
|
||||||
install(DIRECTORY extlibs/libs-mingw/x86/ DESTINATION lib)
|
else()
|
||||||
endif()
|
install(DIRECTORY extlibs/libs-mingw/x86/ DESTINATION lib)
|
||||||
elseif(ARCH_64BITS)
|
endif()
|
||||||
install(DIRECTORY extlibs/bin/x64/ DESTINATION bin)
|
elseif(ARCH_64BITS)
|
||||||
if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14)
|
install(DIRECTORY extlibs/bin/x64/ DESTINATION bin)
|
||||||
install(DIRECTORY extlibs/libs-msvc/x64/ DESTINATION lib)
|
if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14)
|
||||||
elseif(SFML_COMPILER_MSVC)
|
install(DIRECTORY extlibs/libs-msvc/x64/ DESTINATION lib)
|
||||||
install(DIRECTORY extlibs/libs-msvc-universal/x64/ DESTINATION lib)
|
elseif(SFML_COMPILER_MSVC)
|
||||||
else()
|
install(DIRECTORY extlibs/libs-msvc-universal/x64/ DESTINATION lib)
|
||||||
install(DIRECTORY extlibs/libs-mingw/x64/ DESTINATION lib)
|
else()
|
||||||
|
install(DIRECTORY extlibs/libs-mingw/x64/ DESTINATION lib)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@ -486,17 +488,21 @@ elseif(SFML_OS_IOS)
|
|||||||
install(DIRECTORY "${CMAKE_BINARY_DIR}/lib/\$ENV{CONFIGURATION}/" DESTINATION lib${LIB_SUFFIX})
|
install(DIRECTORY "${CMAKE_BINARY_DIR}/lib/\$ENV{CONFIGURATION}/" DESTINATION lib${LIB_SUFFIX})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# since the iOS libraries are built as static, we must install the SFML dependencies
|
if(NOT SFML_USE_SYSTEM_DEPS)
|
||||||
# too so that the end user can easily link them to its final application
|
# since the iOS libraries are built as static, we must install the SFML dependencies
|
||||||
if(SFML_BUILD_GRAPHICS)
|
# too so that the end user can easily link them to its final application
|
||||||
install(FILES extlibs/libs-ios/libfreetype.a extlibs/libs-ios/libjpeg.a DESTINATION lib)
|
if(SFML_BUILD_GRAPHICS)
|
||||||
|
install(FILES extlibs/libs-ios/libfreetype.a extlibs/libs-ios/libjpeg.a DESTINATION lib)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
elseif(SFML_OS_ANDROID)
|
elseif(SFML_OS_ANDROID)
|
||||||
|
|
||||||
# install extlibs
|
if(NOT SFML_USE_SYSTEM_DEPS)
|
||||||
install(DIRECTORY extlibs/libs-android/${ANDROID_ABI} DESTINATION extlibs/lib)
|
# install extlibs
|
||||||
install(FILES extlibs/Android.mk DESTINATION extlibs)
|
install(DIRECTORY extlibs/libs-android/${ANDROID_ABI} DESTINATION extlibs/lib)
|
||||||
|
install(FILES extlibs/Android.mk DESTINATION extlibs)
|
||||||
|
endif()
|
||||||
|
|
||||||
# install Android.mk so the NDK knows how to set up SFML
|
# install Android.mk so the NDK knows how to set up SFML
|
||||||
install(FILES src/SFML/Android.mk DESTINATION .)
|
install(FILES src/SFML/Android.mk DESTINATION .)
|
||||||
|
Loading…
Reference in New Issue
Block a user