Skip to content

Commit b2d431c

Browse files
fix(build): ignore compiler warnings (#462)
1 parent 27e4731 commit b2d431c

File tree

3 files changed

+19
-14
lines changed

3 files changed

+19
-14
lines changed

CMakeLists.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,20 @@ if(UNIX AND NOT APPLE)
4141
include(GNUInstallDirs)
4242
endif()
4343

44+
set(EXTRA_COMPILE_FLAGS "-w" CACHE STRING "Extra compiler flags to use for all targets")
45+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_COMPILE_FLAGS}")
46+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_COMPILE_FLAGS}")
47+
48+
# Set compiler the various targets that use make directly
49+
set(MAKE_COMPILER_FLAGS "CFLAGS='${CMAKE_C_FLAGS}' CXXFLAGS='${CMAKE_CXX_FLAGS}'")
50+
if(CMAKE_C_COMPILER)
51+
set(MAKE_COMPILER_FLAGS "${MAKE_COMPILER_FLAGS} CC=${CMAKE_C_COMPILER}")
52+
endif()
53+
if(CMAKE_CXX_COMPILER)
54+
set(MAKE_COMPILER_FLAGS "${MAKE_COMPILER_FLAGS} CXX=${CMAKE_CXX_COMPILER}")
55+
endif()
56+
message(STATUS "make compiler flags: ${MAKE_COMPILER_FLAGS}")
57+
4458
# if PARALLEL_BUILDS is not defined, set it to the number of processors
4559
if(NOT DEFINED PARALLEL_BUILDS)
4660
include(ProcessorCount)

cmake/ffmpeg/nv_codec_headers.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ set(WORKING_DIR "${NV_CODEC_HEADERS_GENERATED_SRC_PATH}")
1313
UNIX_PATH(WORKING_DIR_UNIX ${WORKING_DIR})
1414
UNIX_PATH(DEST_DIR_UNIX ${CMAKE_CURRENT_BINARY_DIR})
1515
add_custom_target(nv-codec-headers ALL
16-
COMMAND ${SHELL_CMD} "${MAKE_EXECUTABLE} --jobs=${N_PROC}"
16+
COMMAND ${SHELL_CMD} "${MAKE_COMPILER_FLAGS} ${MAKE_EXECUTABLE} --jobs=${N_PROC}"
1717
# this will install the headers to the CMAKE_CURRENT_BINARY_DIR/usr/local
18-
COMMAND ${SHELL_CMD} "DESTDIR=${DEST_DIR_UNIX} ${MAKE_EXECUTABLE} install"
18+
COMMAND ${SHELL_CMD} "${MAKE_COMPILER_FLAGS} DESTDIR=${DEST_DIR_UNIX} ${MAKE_EXECUTABLE} install"
1919
WORKING_DIRECTORY ${WORKING_DIR}
2020
COMMENT "Target: nv-codec-headers"
2121
COMMAND_EXPAND_LISTS

cmake/ffmpeg/x264.cmake

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,27 +43,18 @@ endif()
4343
# configure command will only take the first argument if not converted to string
4444
string(REPLACE ";" " " FFMPEG_X264_EXTRA_CONFIGURE "${FFMPEG_X264_EXTRA_CONFIGURE}")
4545

46-
# Set compiler for x264 configure script
47-
set(X264_COMPILER_FLAGS "")
48-
if(CMAKE_C_COMPILER)
49-
set(X264_COMPILER_FLAGS "CC=${CMAKE_C_COMPILER}")
50-
endif()
51-
if(CMAKE_CXX_COMPILER)
52-
set(X264_COMPILER_FLAGS "${X264_COMPILER_FLAGS} CXX=${CMAKE_CXX_COMPILER}")
53-
endif()
54-
5546
# On Windows, the x264 submodule needs to have line endings converted to LF, see the README.md
5647

5748
set(WORKING_DIR "${X264_GENERATED_SRC_PATH}")
5849
UNIX_PATH(WORKING_DIR_UNIX ${WORKING_DIR})
5950
add_custom_target(x264 ALL
60-
COMMAND ${SHELL_CMD} "${X264_COMPILER_FLAGS} ./configure \
51+
COMMAND ${SHELL_CMD} "${MAKE_COMPILER_FLAGS} ./configure \
6152
--prefix=${CMAKE_CURRENT_BINARY_DIR_UNIX}/x264 \
6253
--disable-cli \
6354
--enable-static \
6455
${FFMPEG_X264_EXTRA_CONFIGURE}"
65-
COMMAND ${SHELL_CMD} "${MAKE_EXECUTABLE} --jobs=${N_PROC}"
66-
COMMAND ${SHELL_CMD} "${MAKE_EXECUTABLE} install"
56+
COMMAND ${SHELL_CMD} "${MAKE_COMPILER_FLAGS} ${MAKE_EXECUTABLE} --jobs=${N_PROC}"
57+
COMMAND ${SHELL_CMD} "${MAKE_COMPILER_FLAGS} ${MAKE_EXECUTABLE} install"
6758
WORKING_DIRECTORY ${WORKING_DIR}
6859
COMMENT "Target: x264"
6960
COMMAND_EXPAND_LISTS

0 commit comments

Comments
 (0)