Skip to content

Commit bcf80c1

Browse files
committed
feat: build with conan v1
Signed-off-by: Dylan <[email protected]>
1 parent 3abe652 commit bcf80c1

File tree

420 files changed

+1866
-74284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

420 files changed

+1866
-74284
lines changed

.cmake/conan.cmake

+1,026
Large diffs are not rendered by default.

.cmake/conan_provider.cmake

+676
Large diffs are not rendered by default.

CMakeLists.txt

+61-77
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,19 @@
11
CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
22

3-
MESSAGE("############# nim_win_demo ##############")
4-
5-
SET(CMAKE_CXX_STANDARD 11)
3+
SET(CMAKE_CXX_STANDARD 14)
64

75
IF (NOT CMAKE_BUILD_TYPE)
86
SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build." FORCE)
97
MESSAGE(STATUS "No CMAKE_BUILD_TYPE selected, defaulting to ${CMAKE_BUILD_TYPE}")
108
ENDIF ()
119

1210
SET(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_LIST_DIR} CACHE PATH "default install prefix" FORCE)
13-
SET(BUILD_WITH_CONAN OFF CACHE BOOL "Build project with conan")
14-
SET(BUILD_WITH_NERTC_G2 OFF CACHE BOOL "Build project with NeRTC G2")
15-
set(INSTALL_CPP_WRAPPER OFF CACHE BOOL "Exports headers of C++ wrapper when called --target INSTALL" FORCE)
16-
17-
IF (CMAKE_BUILD_TYPE MATCHES "Release")
18-
ADD_DEFINITIONS(-DNDEBUG)
19-
ENDIF ()
2011

2112
IF (CMAKE_CL_64)
2213
ELSE ()
2314
ADD_DEFINITIONS(-DSUPPORTLOCALPLAYER)
2415
ENDIF ()
2516

26-
SET(CONAN_DISABLE_CHECK_COMPILER ON)
2717
SET(CMAKE_INCLUDE_CURRENT_DIR ON)
2818
SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
2919
SET_PROPERTY(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "cmake")
@@ -33,79 +23,77 @@ SET(GROUP_UI_COMPONENTS "ui_components")
3323
SET(RELEASE_OUTPUT_7Z_FILE "${CMAKE_BINARY_DIR}/release.7z")
3424
STRING(REPLACE "/" "\\\\" RELEASE_OUTPUT_7Z_FILE_WIN ${RELEASE_OUTPUT_7Z_FILE})
3525

36-
SET(NIM_CROSS_PLATFORM_SDK_FILE_NAME "nim-win32-ia32-9-9-0-383-build-1750145.tar.gz")
37-
SET(DEBUG_THIRD_PARTY_LIBS "http://yx-web.nos.netease.com/package/1619605746/NIM_Windows_Demo_Build_Binaries_Debug.zip")
38-
SET(RELEASE_THIRD_PARTY_LIBS "http://yx-web.nos.netease.com/package/1619605768/NIM_Windows_Demo_Build_Binaries_Release.zip")
39-
SET(NIM_CROSS_PLATFORM_SDK_URL "https://yx-web-nosdn.netease.im/package/${NIM_CROSS_PLATFORM_SDK_FILE_NAME}")
40-
SET(NERTC_SDK_URL "http://yx-web.nos.netease.com/package/1618217725/NERtc_Windows_SDK_v4.1.1.zip")
26+
# SET(NIM_CROSS_PLATFORM_SDK_FILE_NAME "nim-win32-ia32-9-9-0-383-build-1750145.tar.gz")
27+
# SET(DEBUG_THIRD_PARTY_LIBS "http://yx-web.nos.netease.com/package/1619605746/NIM_Windows_Demo_Build_Binaries_Debug.zip")
28+
# SET(RELEASE_THIRD_PARTY_LIBS "http://yx-web.nos.netease.com/package/1619605768/NIM_Windows_Demo_Build_Binaries_Release.zip")
29+
# SET(NIM_CROSS_PLATFORM_SDK_URL "https://yx-web-nosdn.netease.im/package/1725941048477/nim-win32-ia32-release-10-5-0-3214-build-2690765.tar.gz")
30+
# SET(NERTC_SDK_URL "http://yx-web.nos.netease.com/package/1618217725/NERtc_Windows_SDK_v4.1.1.zip")
4131

4232
PROJECT(nim_win_demo)
4333

4434
# Build project with conan
45-
IF (BUILD_WITH_CONAN)
46-
# https://github.com/conan-io/cmake-conan
47-
# Download automatically, you can also just copy the conan.cmake file
48-
IF (NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
49-
MESSAGE(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
50-
FILE(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/master/conan.cmake" "${CMAKE_BINARY_DIR}/conan.cmake")
51-
ENDIF()
52-
INCLUDE(${CMAKE_BINARY_DIR}/conan.cmake)
53-
conan_cmake_autodetect(settings)
54-
conan_cmake_install(PATH_OR_REFERENCE .. BUILD missing SETTINGS ${settings})
55-
INCLUDE(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
56-
conan_basic_setup()
57-
ENDIF ()
58-
59-
# Remove bin lib and include folder
60-
file(REMOVE_RECURSE ${CMAKE_CURRENT_LIST_DIR}/bin)
61-
file(REMOVE_RECURSE ${CMAKE_CURRENT_LIST_DIR}/lib)
62-
file(REMOVE_RECURSE ${CMAKE_CURRENT_LIST_DIR}/include)
35+
# https://github.com/conan-io/cmake-conan
36+
# Download automatically, you can also just copy the conan.cmake file
37+
IF (NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/.cmake/conan.cmake")
38+
MESSAGE(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
39+
FILE(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/master/conan.cmake" "${CMAKE_CURRENT_LIST_DIR}/.cmake/conan.cmake")
40+
ENDIF()
41+
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/.cmake/conan.cmake)
42+
conan_cmake_autodetect(settings)
43+
conan_cmake_install(PATH_OR_REFERENCE .. BUILD missing SETTINGS ${settings})
44+
INCLUDE(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
45+
conan_basic_setup()
46+
47+
# # Remove bin lib and include folder
48+
# file(REMOVE_RECURSE ${CMAKE_CURRENT_LIST_DIR}/bin)
49+
# file(REMOVE_RECURSE ${CMAKE_CURRENT_LIST_DIR}/lib)
50+
# file(REMOVE_RECURSE ${CMAKE_CURRENT_LIST_DIR}/include)
6351

6452
# Download third parties
65-
IF (CMAKE_BUILD_TYPE MATCHES Debug AND NOT BUILD_WITH_CONAN)
66-
IF (NOT EXISTS "${CMAKE_BINARY_DIR}/nim_demo_build_libraries_x86_debug.zip")
67-
MESSAGE(STATUS "Downloading third party libraries from ${DEBUG_THIRD_PARTY_LIBS}")
68-
FILE(DOWNLOAD ${DEBUG_THIRD_PARTY_LIBS} "${CMAKE_BINARY_DIR}/nim_demo_build_libraries_x86_debug.zip")
69-
ENDIF ()
70-
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E tar -xf "${CMAKE_BINARY_DIR}/nim_demo_build_libraries_x86_debug.zip" WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
71-
ENDIF ()
72-
IF (CMAKE_BUILD_TYPE MATCHES Release AND NOT BUILD_WITH_CONAN)
73-
IF (NOT EXISTS "${CMAKE_BINARY_DIR}/nim_demo_build_libraries_x86_release.zip")
74-
MESSAGE(STATUS "Downloading third party libraries from ${RELEASE_THIRD_PARTY_LIBS}")
75-
FILE(DOWNLOAD "${RELEASE_THIRD_PARTY_LIBS}" "${CMAKE_BINARY_DIR}/nim_demo_build_libraries_x86_release.zip")
76-
ENDIF ()
77-
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E tar -xf "${CMAKE_BINARY_DIR}/nim_demo_build_libraries_x86_release.zip" WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
78-
ENDIF ()
53+
# IF (CMAKE_BUILD_TYPE MATCHES Debug AND NOT BUILD_WITH_CONAN)
54+
# IF (NOT EXISTS "${CMAKE_BINARY_DIR}/nim_demo_build_libraries_x86_debug.zip")
55+
# MESSAGE(STATUS "Downloading third party libraries from ${DEBUG_THIRD_PARTY_LIBS}")
56+
# FILE(DOWNLOAD ${DEBUG_THIRD_PARTY_LIBS} "${CMAKE_BINARY_DIR}/nim_demo_build_libraries_x86_debug.zip")
57+
# ENDIF ()
58+
# EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E tar -xf "${CMAKE_BINARY_DIR}/nim_demo_build_libraries_x86_debug.zip" WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
59+
# ENDIF ()
60+
# IF (CMAKE_BUILD_TYPE MATCHES Release AND NOT BUILD_WITH_CONAN)
61+
# IF (NOT EXISTS "${CMAKE_BINARY_DIR}/nim_demo_build_libraries_x86_release.zip")
62+
# MESSAGE(STATUS "Downloading third party libraries from ${RELEASE_THIRD_PARTY_LIBS}")
63+
# FILE(DOWNLOAD "${RELEASE_THIRD_PARTY_LIBS}" "${CMAKE_BINARY_DIR}/nim_demo_build_libraries_x86_release.zip")
64+
# ENDIF ()
65+
# EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E tar -xf "${CMAKE_BINARY_DIR}/nim_demo_build_libraries_x86_release.zip" WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
66+
# ENDIF ()
7967

8068
# Downlaod NeRTC G2 SDK
81-
IF (NOT EXISTS "${CMAKE_BINARY_DIR}/nertc-SDK.zip" AND NOT BUILD_WITH_CONAN)
82-
MESSAGE(STATUS "Downloading NeRTC-SDK from ${NERTC_SDK_URL}")
83-
FILE(DOWNLOAD ${NERTC_SDK_URL} ${CMAKE_BINARY_DIR}/nertc-SDK.zip)
84-
ENDIF ()
85-
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E tar -xf "${CMAKE_BINARY_DIR}/nertc-SDK.zip" WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
86-
FILE(GLOB_RECURSE NERTC_HEADER_FIELS ${CMAKE_BINARY_DIR}/nertc_sdk_windows*/*.h)
87-
FILE(GLOB_RECURSE NERTC_LIB_FIELS ${CMAKE_BINARY_DIR}/nertc_sdk_windows*/lib/x86/*.lib)
88-
FILE(GLOB_RECURSE NERTC_BINARY_FIELS ${CMAKE_BINARY_DIR}/nertc_sdk_windows*/dll/x86/*.dll)
89-
90-
FILE(COPY ${NERTC_HEADER_FIELS} DESTINATION ${CMAKE_CURRENT_LIST_DIR}/include)
91-
FILE(COPY ${NERTC_LIB_FIELS} DESTINATION ${CMAKE_CURRENT_LIST_DIR}/lib)
92-
FILE(COPY ${NERTC_BINARY_FIELS} DESTINATION ${CMAKE_CURRENT_LIST_DIR}/bin)
69+
# IF (NOT EXISTS "${CMAKE_BINARY_DIR}/nertc-SDK.zip" AND NOT BUILD_WITH_CONAN)
70+
# MESSAGE(STATUS "Downloading NeRTC-SDK from ${NERTC_SDK_URL}")
71+
# FILE(DOWNLOAD ${NERTC_SDK_URL} ${CMAKE_BINARY_DIR}/nertc-SDK.zip)
72+
# ENDIF ()
73+
# EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E tar -xf "${CMAKE_BINARY_DIR}/nertc-SDK.zip" WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
74+
# FILE(GLOB_RECURSE NERTC_HEADER_FIELS ${CMAKE_BINARY_DIR}/nertc_sdk_windows*/*.h)
75+
# FILE(GLOB_RECURSE NERTC_LIB_FIELS ${CMAKE_BINARY_DIR}/nertc_sdk_windows*/lib/x86/*.lib)
76+
# FILE(GLOB_RECURSE NERTC_BINARY_FIELS ${CMAKE_BINARY_DIR}/nertc_sdk_windows*/dll/x86/*.dll)
77+
78+
# FILE(COPY ${NERTC_HEADER_FIELS} DESTINATION ${CMAKE_CURRENT_LIST_DIR}/include)
79+
# FILE(COPY ${NERTC_LIB_FIELS} DESTINATION ${CMAKE_CURRENT_LIST_DIR}/lib)
80+
# FILE(COPY ${NERTC_BINARY_FIELS} DESTINATION ${CMAKE_CURRENT_LIST_DIR}/bin)
9381

9482
# Copy Resources
95-
execute_process( COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_LIST_DIR}/resource ${CMAKE_CURRENT_LIST_DIR}/bin)
83+
# execute_process( COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_LIST_DIR}/resource ${CMAKE_CURRENT_LIST_DIR}/bin)
9684

9785
# Download NeIM SDK
98-
IF (NOT EXISTS "${CMAKE_BINARY_DIR}/nim-cross-platform-SDK.zip" AND NOT BUILD_WITH_CONAN)
99-
MESSAGE(STATUS "Downloading NIM cross-platform SDK from ${NIM_CROSS_PLATFORM_SDK_URL}")
100-
FILE(DOWNLOAD ${NIM_CROSS_PLATFORM_SDK_URL} ${CMAKE_BINARY_DIR}/${NIM_CROSS_PLATFORM_SDK_FILE_NAME})
101-
ENDIF ()
102-
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E tar -xf ${CMAKE_BINARY_DIR}/${NIM_CROSS_PLATFORM_SDK_FILE_NAME} WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
103-
# EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E tar -xf ${CMAKE_BINARY_DIR}/nim-win32-ia32-refs-tags-9.4.0.1554-build.166.tar.gz WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
104-
IF (NOT BUILD_WITH_CONAN)
105-
ADD_SUBDIRECTORY(wrapper)
106-
INCLUDE_DIRECTORIES(wrapper)
107-
LINK_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/wrapper)
108-
ENDIF ()
86+
# IF (NOT EXISTS "${CMAKE_BINARY_DIR}/nim-cross-platform-SDK.zip" AND NOT BUILD_WITH_CONAN)
87+
# MESSAGE(STATUS "Downloading NIM cross-platform SDK from ${NIM_CROSS_PLATFORM_SDK_URL}")
88+
# FILE(DOWNLOAD ${NIM_CROSS_PLATFORM_SDK_URL} ${CMAKE_BINARY_DIR}/${NIM_CROSS_PLATFORM_SDK_FILE_NAME})
89+
# ENDIF ()
90+
# EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E tar -xf ${CMAKE_BINARY_DIR}/${NIM_CROSS_PLATFORM_SDK_FILE_NAME} WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
91+
# # EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E tar -xf ${CMAKE_BINARY_DIR}/nim-win32-ia32-refs-tags-9.4.0.1554-build.166.tar.gz WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
92+
# IF (NOT BUILD_WITH_CONAN)
93+
# ADD_SUBDIRECTORY(wrapper)
94+
# INCLUDE_DIRECTORIES(wrapper)
95+
# LINK_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/wrapper)
96+
# ENDIF ()
10997

11098
ADD_DEFINITIONS(
11199
-DUNICODE
@@ -114,9 +102,7 @@ ADD_DEFINITIONS(
114102
-DBUILD_WITH_XML_UTIL
115103
)
116104

117-
IF (BUILD_WITH_NERTC_G2)
118-
ADD_DEFINITIONS(-DUSING_RTC_G2)
119-
ENDIF ()
105+
ADD_DEFINITIONS(-DUSING_RTC_G2)
120106

121107
# Git information
122108
LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/.cmake/")
@@ -161,10 +147,8 @@ ADD_SUBDIRECTORY(tool_kits/ui_component/nim_service)
161147
ADD_SUBDIRECTORY(tool_kits/ui_component/ui_kit)
162148
ADD_SUBDIRECTORY(tool_kits/cef/cef_module)
163149
ADD_SUBDIRECTORY(tool_kits/cef/cef_render)
164-
ADD_SUBDIRECTORY(tool_kits/cef/cef_wrapper)
165150
ADD_SUBDIRECTORY(app_sdk)
166151
ADD_SUBDIRECTORY(nim_win_demo)
167-
# uninstall
168152
ADD_SUBDIRECTORY(tool_kits/uninstall)
169153

170154
SET_PROPERTY(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT nim_demo)

CMakePresets.json

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
{
2+
"version": 3,
3+
"cmakeMinimumRequired": {
4+
"major": 3,
5+
"minor": 19,
6+
"patch": 0
7+
},
8+
"configurePresets": [
9+
{
10+
"name": "windows",
11+
"hidden": true,
12+
"condition": {
13+
"type": "equals",
14+
"lhs": "${hostSystemName}",
15+
"rhs": "Windows"
16+
},
17+
"warnings": {
18+
"dev": true,
19+
"deprecated": true
20+
},
21+
"architecture": {
22+
"value": "Win32",
23+
"strategy": "set"
24+
},
25+
"cacheVariables": {
26+
"CMAKE_INSTALL_PREFIX": "${sourceDir}"
27+
}
28+
},
29+
{
30+
"name": "Debug-Win32",
31+
"inherits": "windows",
32+
"displayName": "Windows (Debug)",
33+
"description": "Conan v2 with CMake example for Windows - Debug Configuration",
34+
"binaryDir": "${sourceDir}/build",
35+
"cacheVariables": {
36+
"CMAKE_BUILD_TYPE": "Debug",
37+
"CMAKE_DEBUG_POSTFIX": "d"
38+
}
39+
},
40+
{
41+
"name": "Release-Win32",
42+
"inherits": "windows",
43+
"displayName": "Windows (Release)",
44+
"description": "Conan v2 with CMake example for Windows - Release Configuration",
45+
"binaryDir": "${sourceDir}/build",
46+
"cacheVariables": {
47+
"CMAKE_BUILD_TYPE": "Release",
48+
"CMAKE_INSTALL_PREFIX": "${sourceDir}/win32-release"
49+
}
50+
}
51+
],
52+
"buildPresets": [
53+
{
54+
"name": "Debug-Win32",
55+
"configurePreset": "Debug-Win32",
56+
"displayName": "Windows Local Compilation (Debug)",
57+
"description": "Conan v2 with CMake example for Windows - Debug Configuration",
58+
"configuration": "Debug"
59+
},
60+
{
61+
"name": "Release-Win32",
62+
"configurePreset": "Release-Win32",
63+
"displayName": "Windows Local Compilation (Release)",
64+
"description": "Conan v2 with CMake example for Windows - Release Configuration",
65+
"configuration": "Release"
66+
}
67+
]
68+
}

README.md

-19
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,8 @@ cmake -Bbuild -G"Visual Studio 15 2017" -T"v141_xp" -DCMAKE_BUILD_TYPE=Debug
3737
执行如上命令后,会自动下载依赖的三方库文件并解压到工程目录下,如执行无误您将看到如下信息:
3838

3939
```bash
40-
############# nim_win_demo ##############
4140
-- Downloading third party libraries from http://yx-web.nos.netease.com/package/1619524144/nim_demo_build_libraries_x86_debug.zip
4241
-- Current git tag: 8.4.0, commit count: 772, describe: 8.4.0-2-gbe6c7fea
43-
############# core #############
44-
############# base #############
45-
############# duilib #############
46-
############# shared #############
47-
############# db #############
48-
############# transfer file P2P #############
49-
############# av_kit #############
50-
############# rtc_kit #############
51-
############# capture_image #############
52-
############# image_view #############
53-
############# nim_service #############
54-
############# ui_kit #############
55-
############# cef_module #############
56-
############# cef_render #############
57-
############# libcef_dll_wrapper #############
58-
############# app_sdk #############
59-
############# nim_demo #############
60-
############# nim demo uninstaller #############
6142
-- Configuring done
6243
-- Generating done
6344
-- Build files have been written to: C:/Code/nim_demo/build

app_sdk/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
MESSAGE("############# app_sdk #############")
2-
31
SET(TARGET_NAME app_sdk)
42

53
PROJECT(${TARGET_NAME})

chatroom/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
MESSAGE("############# core #############")
2-
31
SET(TARGET_NAME chatroom)
42

53
PROJECT(${TARGET_NAME})

conanfile.py

+31-31
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
from conans import ConanFile, tools
2-
import platform
1+
from conan import ConanFile
2+
from conan.errors import ConanInvalidConfiguration
3+
from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
4+
from conan.tools.files import get, copy, collect_libs
5+
from conan.tools.scm import Git
6+
from conan.tools.build import check_min_cppstd
7+
import os
8+
import re
39

410

5-
class ModuleConan(ConanFile):
11+
class NebaseConan(ConanFile):
12+
name = "nim_demo"
13+
author = "Dylan <[email protected]>"
14+
url = "https://github.com/netease-kit/NIM_PC_Demo.git"
15+
description = "nim_demo"
616
settings = "os", "compiler", "build_type", "arch"
7-
build_requires = (
8-
# "sqlcipher/4.4.2",
9-
"openssl/1.1.1k",
10-
"tinyxml/2.6.2",
11-
"jsoncpp/1.9.4",
12-
"libuv/1.41.0",
13-
"libyuv/cci.20201106",
14-
"sqlite3/3.35.3",
15-
"cef_2623_binaries/1.0.0-3-ge03c0ce@yunxin/testing",
16-
"nls_play/1.0.0-1-g3f1fcc3@yunxin/testing",
17-
"nim_p2p_sdk/1.0.0-3-g6a6cedb@yunxin/testing",
18-
"nim_cpp_wrapper/8.5.0@yunxin/testing",
19-
"nertc/4.1.1-2-g0dc7953@yunxin/testing"
20-
)
21-
generators = "cmake"
22-
build_policy = "missing"
17+
options = {"shared": [True, False], "fPIC": [True, False]}
18+
default_options = {"shared": False, "fPIC": True}
19+
generators = "CMakeDeps", "cmake_paths", "cmake_find_package", "cmake"
20+
exports_sources = "*", "!build"
2321

24-
def imports(self):
25-
self.copy("*.dll", "bin", "bin", keep_path=True)
26-
self.copy("*.pak", "bin", "bin", keep_path=True)
27-
self.copy("*.dat", "bin", "bin", keep_path=True)
28-
self.copy("cef*.pak", src="bin", dst="bin")
29-
self.copy("*.txt", "bin", "bin", keep_path=True)
30-
self.copy("*.bin", "bin", "bin", keep_path=True)
31-
self.copy("wow_helper.exe", "bin", "bin", keep_path=True)
32-
self.copy("*.html", "bin", "bin", keep_path=True)
33-
self.copy("*.dylib", "lib", "lib")
34-
self.copy("*.lib", "lib", "lib")
35-
self.copy("*.h", "include", "include", keep_path=True)
22+
def requirements(self):
23+
self.requires("libjpeg/9e")
24+
self.requires("openssl/3.3.2")
25+
self.requires("jsoncpp/1.9.5")
26+
self.requires("libuv/1.49.0")
27+
self.requires("libyuv/1892")
28+
self.requires("sqlite3/3.46.1")
29+
self.requires("tinyxml/2.6.2")
30+
self.requires("nim/10.5.0@yunxin/stable")
31+
self.requires("nertc/4.1.1@yunxin/stable")
32+
self.requires("cef/2623@yunxin/stable")
33+
self.requires("ne_live_player/1.1.1@yunxin/stable")
34+
self.requires("image_ole/4.2.0@yunxin/stable")
35+
self.requires("ne_transfer/0.1.0@yunxin/stable")

nim_win_demo/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
MESSAGE("############# nim_demo #############")
2-
31
SET(TARGET_NAME nim_demo)
42

53
PROJECT(${TARGET_NAME} DESCRIPTION "NetEase IM Demo")

tool_kits/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
22

3-
MESSAGE("############# nim demo installer #############")
4-
53
SET(CMAKE_CXX_STANDARD 11)
64
SET(TARGET_NAME installer)
75

tool_kits/base/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
MESSAGE("############# base #############")
2-
31
SET(TARGET_NAME base)
42

53
PROJECT(${TARGET_NAME})

tool_kits/cef/cef_module/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
MESSAGE("############# cef_module #############")
2-
31
SET(TARGET_NAME cef_module)
42

53
PROJECT(${TARGET_NAME})

0 commit comments

Comments
 (0)