Skip to content

Commit 9f5ea05

Browse files
committed
e
1 parent 8ce4b0c commit 9f5ea05

File tree

3 files changed

+2
-11
lines changed

3 files changed

+2
-11
lines changed

.github/workflows/build_mac.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: macos-latest
2727
steps:
2828
- name: Install dependencies
29-
run: brew install pkg-config autoconf automake libtool tesseract leptonica gpac
29+
run: brew install pkg-config autoconf automake libtool tesseract leptonica gpac nanomsg
3030
- uses: actions/checkout@v4
3131
- name: build
3232
run: ./build.command
@@ -47,7 +47,7 @@ jobs:
4747
steps:
4848
- uses: actions/checkout@v4
4949
- name: Install dependencies
50-
run: brew install pkg-config autoconf automake libtool gpac
50+
run: brew install pkg-config autoconf automake libtool gpac nanomsg
5151
- name: run autogen
5252
run: ./autogen.sh
5353
working-directory: ./mac

src/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ add_subdirectory (lib_ccx)
152152
aux_source_directory(${PROJECT_SOURCE_DIR} SOURCEFILE)
153153
set (EXTRA_LIBS ${EXTRA_LIBS} ccx)
154154
set (EXTRA_LIBS ${EXTRA_LIBS} ${GPAC_LIBRARIES})
155-
set (EXTRA_LIBS ${EXTRA_LIBS} ${NANOMSG_LIBRARIES})
156155
# set (EXTRA_LIBS ${EXTRA_LIBS} m)
157156

158157
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -263,10 +262,7 @@ else ()
263262
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_RUST")
264263
endif (PKG_CONFIG_FOUND AND NOT WITHOUT_RUST)
265264

266-
pkg_check_modules(NANOMSG REQUIRED nanomsg)
267265

268-
set(EXTRA_INCLUDES ${EXTRA_INCLUDES} ${NANOMSG_INCLUDE_DIR})
269-
set(EXTRA_LIBS ${EXTRA_LIBS} ${NANOMSG_LIBRARIES})
270266

271267
target_link_libraries (ccextractor ${EXTRA_LIBS})
272268
target_include_directories (ccextractor PUBLIC ${EXTRA_INCLUDES})

src/lib_ccx/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,7 @@ pkg_check_modules (GPAC REQUIRED gpac)
1515

1616
set (EXTRA_INCLUDES ${EXTRA_INCLUDES} ${GPAC_INCLUDE_DIRS})
1717
set (EXTRA_LIBS ${EXTRA_LIBS} ${GPAC_LIBRARIES})
18-
##new
19-
pkg_check_modules(NANOMSG REQUIRED nanomsg)
2018

21-
set(EXTRA_INCLUDES ${EXTRA_INCLUDES} ${NANOMSG_INCLUDE_DIRS})
22-
set(EXTRA_LIBS ${EXTRA_LIBS} ${NANOMSG_LIBRARIES})
23-
##new
2419

2520
if (WITH_FFMPEG)
2621
find_package(PkgConfig)

0 commit comments

Comments
 (0)