etlegacy
/
etlegacy-libs
mirror of https://github.com/etlegacy/etlegacy-libs.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libs: clean up CMakeLists.txt

This commit is contained in:
Remy Marquis 2018-02-04 20:44:20 +01:00
parent 39728a3ea5
commit aa1b4f32fb
2 changed files with 2 additions and 1864 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
CMakeLists.txt
View File

@ -444,28 +444,6 @@ elseif(UNIX)
# Build bundled cURL library # Build bundled cURL library
#----------------------------------------------------------------- #-----------------------------------------------------------------
if(BUNDLED_CURL AND (BUILD_CLIENT OR BUILD_SERVER)) if(BUNDLED_CURL AND (BUILD_CLIENT OR BUILD_SERVER))
# add_custom_command(OUTPUT ${CMAKE_CURRENT_LIST_DIR}/curl/lib/.libs/libcurl.a
# COMMAND make clean || true
# COMMAND ${CROSS_COMPILE32_FLAGS} ./configure
# --enable-shared=no --enable-static=yes
# --enable-http --enable-ftp --disable-file
# --disable-ldap --disable-ldaps --disable-rtsp
# --enable-proxy --disable-dict --disable-telnet
# --disable-tftp --disable-pop3 --disable-imap
# --disable-smb --disable-smtp --disable-gopher
# --without-ssl --without-libssh2 --without-nghttp2
# --without-gssapi --with-zlib
# --disable-ares --enable-threaded-resolver
# --enable-ipv6 --enable-unix-sockets
# --without-libidn2 --disable-manual
# --disable-sspi --enable-libgcc
# --without-libmetalink --without-libpsl
# --without-librtmp && make
# WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/curl
# )
# add_custom_target(bundled_curl
# DEPENDS ${CMAKE_CURRENT_LIST_DIR}/curl/lib/.libs/libcurl.a
# )
ExternalProject_Add( ExternalProject_Add(
bundled_curl bundled_curl
@ -534,7 +512,7 @@ elseif(UNIX)
if(CMAKE_SYSTEM MATCHES "OpenBSD*") if(CMAKE_SYSTEM MATCHES "OpenBSD*")
set(LUA_MAKE_TARGET "bsd") set(LUA_MAKE_TARGET "bsd")
elseif(CMAKE_SYSTEM MATCHES "Darwin") elseif(CMAKE_SYSTEM MATCHES "Darwin")
set(LUA_MAKE_TARGET "macosx") set(LUA_MAKE_TARGET "macosx")
else() else()
set(LUA_MAKE_TARGET "posix") set(LUA_MAKE_TARGET "posix")
# if(NOT CROSS_COMPILE32) # if(NOT CROSS_COMPILE32)
@ -544,16 +522,6 @@ elseif(UNIX)
# endif() # endif()
endif() endif()
# add_custom_command(OUTPUT ${CMAKE_CURRENT_LIST_DIR}/lua/src/liblua.a
# COMMAND make clean || true
# COMMAND ${CROSS_COMPILE32_FLAGS} make ${LUA_MAKE_TARGET}
# WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/lua/src
# )
# add_custom_target(bundled_lua
# DEPENDS ${CMAKE_CURRENT_LIST_DIR}/lua/src/liblua.a
# )
ExternalProject_Add( ExternalProject_Add(
bundled_lua bundled_lua
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/lua SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/lua
@ -572,16 +540,6 @@ elseif(UNIX)
# Build bundled OGG and Vorbis file library # Build bundled OGG and Vorbis file library
#----------------------------------------------------------------- #-----------------------------------------------------------------
if(BUNDLED_OGG_VORBIS AND BUILD_CLIENT) if(BUNDLED_OGG_VORBIS AND BUILD_CLIENT)
# OGG
# add_custom_command(OUTPUT ${CMAKE_CURRENT_LIST_DIR}/ogg/src/.libs/libogg.a
# COMMAND make clean || true
# COMMAND ./autogen.sh
# COMMAND ${CROSS_COMPILE32_FLAGS} ./configure && make
# WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/ogg
# )
# add_custom_target(bundled_ogg
# DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ogg/src/.libs/libogg.a
# )
ExternalProject_Add( ExternalProject_Add(
bundled_ogg bundled_ogg
@ -604,18 +562,6 @@ elseif(UNIX)
# the above set of CFLAGS and LDFLAGS don't trigger on some systems # the above set of CFLAGS and LDFLAGS don't trigger on some systems
# ensure vorbis configure uses our bundled ogg see --with-ogg-includes & --with-ogg-libraries # ensure vorbis configure uses our bundled ogg see --with-ogg-includes & --with-ogg-libraries
# add_custom_command(
# OUTPUT ${CMAKE_CURRENT_LIST_DIR}/vorbis/lib/.libs/libvorbisfile.a
# COMMAND make clean || true
# COMMAND ${CROSS_COMPILE32_FLAGS} ./configure --disable-oggtest --with-ogg-includes=${CMAKE_CURRENT_LIST_DIR}/ogg/include --with-ogg-libraries=${CMAKE_CURRENT_LIST_DIR}/ogg/src/.libs && make
# WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/vorbis
# )
# add_custom_target(bundled_ogg_vorbis_file
# DEPENDS ${CMAKE_CURRENT_LIST_DIR}/vorbis/lib/.libs/libvorbisfile.a
# )
# add_custom_target(bundled_ogg_vorbis
# DEPENDS ${CMAKE_CURRENT_LIST_DIR}/vorbis/lib/.libs/libvorbis.a
# )
ExternalProject_Add( ExternalProject_Add(
bundled_ogg_vorbis bundled_ogg_vorbis
@ -679,7 +625,7 @@ if(BUNDLED_SDL AND BUILD_CLIENT)
) )
if(CMAKE_SYSTEM MATCHES "Darwin" OR WIN32) if(CMAKE_SYSTEM MATCHES "Darwin" OR WIN32)
set(SDL32_BUNDLED_LIBRARIES optimized "${LIBS_BINARYDIR_DIR}/sdl2/lib/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2main${CMAKE_STATIC_LIBRARY_SUFFIX}" debug "${LIBS_BINARYDIR_DIR}/sdl2/lib/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2maind${CMAKE_STATIC_LIBRARY_SUFFIX}") set(SDL32_BUNDLED_LIBRARIES optimized "${LIBS_BINARYDIR_DIR}/sdl2/lib/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2main${CMAKE_STATIC_LIBRARY_SUFFIX}" debug "${LIBS_BINARYDIR_DIR}/sdl2/lib/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2maind${CMAKE_STATIC_LIBRARY_SUFFIX}")
endif() endif()
set(SDL32_BUNDLED_LIBRARIES ${SDL32_BUNDLED_LIBRARIES} optimized "${LIBS_BINARYDIR_DIR}/sdl2/lib/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2${CMAKE_STATIC_LIBRARY_SUFFIX}" debug "${LIBS_BINARYDIR_DIR}/sdl2/lib/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2d${CMAKE_STATIC_LIBRARY_SUFFIX}") set(SDL32_BUNDLED_LIBRARIES ${SDL32_BUNDLED_LIBRARIES} optimized "${LIBS_BINARYDIR_DIR}/sdl2/lib/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2${CMAKE_STATIC_LIBRARY_SUFFIX}" debug "${LIBS_BINARYDIR_DIR}/sdl2/lib/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2d${CMAKE_STATIC_LIBRARY_SUFFIX}")

1808
curl/Makefile
View File

File diff suppressed because it is too large Load Diff