mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-12-23 01:55:48 -05:00
Temporary switch to forks
This commit is contained in:
parent
b67705a625
commit
2a86bc566a
2
.gitmodules
vendored
2
.gitmodules
vendored
@ -1,3 +1,3 @@
|
||||
[submodule "external/windows"]
|
||||
path = external/windows
|
||||
url = https://github.com/f4exb/sdrangel-windows-libraries.git
|
||||
url = https://github.com/kasper93/sdrangel-windows-libraries.git
|
||||
|
15
external/CMakeLists.txt
vendored
15
external/CMakeLists.txt
vendored
@ -10,7 +10,7 @@
|
||||
# which version/tag/checkout to use
|
||||
set(CODEC2_TAG "v0.9.2")
|
||||
set(CM256CC_TAG c0e92b92aca3d1d36c990b642b937c64d363c559)
|
||||
set(MBELIB_TAG 9a04ed5c78176a9965f3d43f7aa1b1f5330e771f)
|
||||
set(MBELIB_TAG fe83b32c6a60cdd7bce8cecf3c7a0b9ec87a7667)
|
||||
set(SERIALDV_TAG "v1.1.4")
|
||||
set(DSDCC_TAG "v1.9.0")
|
||||
set(LIMESUITE_TAG "v20.01.0")
|
||||
@ -219,11 +219,17 @@ endif (NOT APPLE AND (NOT CM256CC_FOUND OR CM256CC_EXTERNAL))
|
||||
|
||||
if ((NOT LIBDSDCC_FOUND OR LIBDSDCC_EXTERNAL) AND (NOT LIBMBE_FOUND OR LIBMBE_EXTERNAL))
|
||||
set(USE_MBELIB OFF)
|
||||
if (WIN32)
|
||||
set(LIBMBE_LIBRARIES "${SDRANGEL_BINARY_LIB_DIR}/libmbe.lib" CACHE INTERNAL "")
|
||||
elseif (LINUX)
|
||||
set(LIBMBE_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib/libmbe${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
|
||||
endif ()
|
||||
ExternalProject_Add(mbelib
|
||||
GIT_REPOSITORY https://github.com/szechyjs/mbelib.git
|
||||
GIT_REPOSITORY https://github.com/kasper93/mbelib.git
|
||||
GIT_TAG ${MBELIB_TAG}
|
||||
PREFIX "${EXTERNAL_BUILD_LIBRARIES}/mbelib"
|
||||
CMAKE_ARGS -DDISABLE_TEST=ON ${DEFAULT_OUTPUT_DIRECTORIES}
|
||||
BUILD_BYPRODUCTS "${LIBMBE_LIBRARIES}"
|
||||
INSTALL_COMMAND ""
|
||||
TEST_COMMAND ""
|
||||
)
|
||||
@ -234,10 +240,7 @@ if ((NOT LIBDSDCC_FOUND OR LIBDSDCC_EXTERNAL) AND (NOT LIBMBE_FOUND OR LIBMBE_EX
|
||||
set(LIBMBE_EXTERNAL ON CACHE INTERNAL "")
|
||||
set(LIBMBE_INCLUDE_DIR "${source_dir}" CACHE INTERNAL "")
|
||||
if (WIN32)
|
||||
set(LIBMBE_LIBRARIES "${SDRANGEL_BINARY_LIB_DIR}/mbe.lib" CACHE INTERNAL "")
|
||||
install(FILES "${SDRANGEL_BINARY_BIN_DIR}/mbe${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION "${INSTALL_LIB_DIR}")
|
||||
elseif (LINUX)
|
||||
set(LIBMBE_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib/libmbe${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
|
||||
install(FILES "${SDRANGEL_BINARY_BIN_DIR}/libmbe${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION "${INSTALL_LIB_DIR}")
|
||||
elseif (APPLE)
|
||||
set(LIBMBE_LIBRARIES "${binary_dir}/libmbe${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
|
||||
install(DIRECTORY "${binary_dir}/" DESTINATION "${INSTALL_LIB_DIR}"
|
||||
|
2
external/windows
vendored
2
external/windows
vendored
@ -1 +1 @@
|
||||
Subproject commit f781c2fa49717ff509fdb82eb50c1c55bd64b41d
|
||||
Subproject commit fd7d2b7a202631642ced85cf4268ec46987a4d60
|
Loading…
Reference in New Issue
Block a user