Skip to content

Commit 3129f7e

Browse files
committed
Move definition of LINUX var
1 parent 1e19551 commit 3129f7e

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
cmake_minimum_required(VERSION 3.18)
22
project(TorchCodec)
33

4+
# Define LINUX platform variable globally
5+
if (UNIX AND NOT APPLE)
6+
set(LINUX TRUE)
7+
else()
8+
set(LINUX FALSE)
9+
endif()
10+
411
add_subdirectory(src/torchcodec/_core)
512

613

src/torchcodec/_core/fetch_and_expose_non_gpl_ffmpeg_libs.cmake

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ endif()
99

1010
include(FetchContent)
1111

12-
if (UNIX AND NOT APPLE)
13-
set(LINUX TRUE)
14-
else()
15-
set(LINUX FALSE)
16-
endif()
17-
1812
set(
1913
base_url
2014
https://pytorch.s3.amazonaws.com/torchcodec/ffmpeg/2025-03-14
@@ -136,6 +130,7 @@ FetchContent_Declare(
136130

137131
FetchContent_MakeAvailable(f4 f5 f6 f7 f8)
138132

133+
# makes add_ffmpeg_target available
139134
include("${CMAKE_CURRENT_SOURCE_DIR}/../share/cmake/TorchCodec/ffmpeg_versions.cmake")
140135

141136
# Note: the f?_SOURCE_DIR variables were set by FetchContent_MakeAvailable

src/torchcodec/share/cmake/TorchCodec/ffmpeg_versions.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ set(TORCHCODEC_SUPPORTED_FFMPEG_VERSIONS "4;5;6;7;8")
3939

4040
# Below we define FFmpeg library names we expect to have for each FFmpeg
4141
# major version on each platform we support.
42-
if (UNIX AND NOT APPLE)
42+
if (LINUX)
4343
set(
4444
f4_library_file_names
4545
libavutil.so.56
@@ -212,7 +212,7 @@ function(add_ffmpeg_target ffmpeg_major_version prefix)
212212

213213
set(target "torchcodec::ffmpeg${ffmpeg_major_version}")
214214
set(incdir "${prefix}/include")
215-
if (UNIX OR APPLE)
215+
if (LINUX OR APPLE)
216216
set(libdir "${prefix}/lib")
217217
elseif (WIN32)
218218
set(libdir "${prefix}/bin")

0 commit comments

Comments
 (0)