TeaSpeak/Teaspeak-Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replaced all tabs with 4 spaces

Browse Source
This commit is contained in:
WolverinDEV 2020-01-24 02:50:00 +01:00
parent 4fa9123a31
commit b2199c8d56
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
CMakeLists.txt
View File

@ -15,30 +15,30 @@ set(CMAKE_PREFIX_PATH "/home/wolverindev/clib/qt/5.6.1/5.6/gcc_64/lib/cmake")
set(LIBEVENT_PATH "${LIBRARY_PATH}/event/build/lib/") set(LIBEVENT_PATH "${LIBRARY_PATH}/event/build/lib/")
function(resolve_library VARIABLE FALLBACK PATHS) function(resolve_library VARIABLE FALLBACK PATHS)
set( _PATHS ${PATHS} ${ARGN} ) # Merge them together set( _PATHS ${PATHS} ${ARGN} ) # Merge them together
foreach(PATH IN ITEMS ${_PATHS}) foreach(PATH IN ITEMS ${_PATHS})
message(STATUS "Try to use path ${PATH} for ${VARIABLE}") message(STATUS "Try to use path ${PATH} for ${VARIABLE}")
if(EXISTS ${PATH}) if(EXISTS ${PATH})
message(STATUS "Setting ${VARIABLE} to ${PATH}") message(STATUS "Setting ${VARIABLE} to ${PATH}")
set(${VARIABLE} ${PATH} PARENT_SCOPE) set(${VARIABLE} ${PATH} PARENT_SCOPE)
return() return()
endif() endif()
endforeach() endforeach()
if(FALLBACK) if(FALLBACK)
message(WARNING "Failed to resolve library path for ${VARIABLE}. Using default ${VARIABLE}") message(WARNING "Failed to resolve library path for ${VARIABLE}. Using default ${VARIABLE}")
else() else()
message(FATAL_ERROR "Failed to find requited library. Variable: ${VARIABLE} Paths: ${_PATHS}") message(FATAL_ERROR "Failed to find requited library. Variable: ${VARIABLE} Paths: ${_PATHS}")
endif() endif()
endfunction() endfunction()
if (NOT BUILD_OS_ARCH) if (NOT BUILD_OS_ARCH)
set(BUILD_OS_ARCH $ENV{BUILD_OS_ARCH}) set(BUILD_OS_ARCH $ENV{BUILD_OS_ARCH})
endif () endif ()
if (NOT BUILD_OS_ARCH) if (NOT BUILD_OS_ARCH)
set(BUILD_OS_ARCH $ENV{build_os_arch}) set(BUILD_OS_ARCH $ENV{build_os_arch})
endif () endif ()
resolve_library(LIBRARY_TOM_MATH OFF "${LIBRARY_PATH}/tommath/build/libtommathStatic.a") resolve_library(LIBRARY_TOM_MATH OFF "${LIBRARY_PATH}/tommath/build/libtommathStatic.a")
@ -59,11 +59,11 @@ resolve_library(LIBRARY_PATH_NICE OFF "${LIBRARY_PATH}/libnice/lin
message("Found libnice at ${LIBRARY_PATH_NICE}") message("Found libnice at ${LIBRARY_PATH_NICE}")
if (EXISTS "${LIBRARY_PATH}/glibc/linux_${BUILD_OS_ARCH}/lib/i386-linux-gnu/") if (EXISTS "${LIBRARY_PATH}/glibc/linux_${BUILD_OS_ARCH}/lib/i386-linux-gnu/")
set(GLIBC_LIB_DIR "${LIBRARY_PATH}/glibc/linux_${BUILD_OS_ARCH}/lib/i386-linux-gnu/") set(GLIBC_LIB_DIR "${LIBRARY_PATH}/glibc/linux_${BUILD_OS_ARCH}/lib/i386-linux-gnu/")
elseif(EXISTS "${LIBRARY_PATH}/glibc/linux_${BUILD_OS_ARCH}/lib/x86_64-linux-gnu/") elseif(EXISTS "${LIBRARY_PATH}/glibc/linux_${BUILD_OS_ARCH}/lib/x86_64-linux-gnu/")
set(GLIBC_LIB_DIR "${LIBRARY_PATH}/glibc/linux_${BUILD_OS_ARCH}/lib/x86_64-linux-gnu/") set(GLIBC_LIB_DIR "${LIBRARY_PATH}/glibc/linux_${BUILD_OS_ARCH}/lib/x86_64-linux-gnu/")
else() else()
message(FATAL_ERROR "Failed to find glibc") message(FATAL_ERROR "Failed to find glibc")
endif () endif ()
message("Found GLIBC lib dir at ${GLIBC_LIB_DIR}") message("Found GLIBC lib dir at ${GLIBC_LIB_DIR}")
set(LIBRARY_PATH_GLIBC "${GLIBC_LIB_DIR}/libgio-2.0.a;${GLIBC_LIB_DIR}/libgmodule-2.0.a;${GLIBC_LIB_DIR}/libglib-2.0.a;${GLIBC_LIB_DIR}/libgobject-2.0.a;${GLIBC_LIB_DIR}/libffi.a;resolv") set(LIBRARY_PATH_GLIBC "${GLIBC_LIB_DIR}/libgio-2.0.a;${GLIBC_LIB_DIR}/libgmodule-2.0.a;${GLIBC_LIB_DIR}/libglib-2.0.a;${GLIBC_LIB_DIR}/libgobject-2.0.a;${GLIBC_LIB_DIR}/libffi.a;resolv")

2
shared

@ -1 +1 @@
Subproject commit e4cdbf7385906898cfe450b6a5ad8721f145ea92 Subproject commit b85c51951cd01b3535b9dd782908d02cac8f1455