File tree Expand file tree Collapse file tree 3 files changed +19
-14
lines changed Expand file tree Collapse file tree 3 files changed +19
-14
lines changed Original file line number Diff line number Diff line change @@ -41,6 +41,20 @@ if(UNIX AND NOT APPLE)
41
41
include (GNUInstallDirs )
42
42
endif ()
43
43
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
+
44
58
# if PARALLEL_BUILDS is not defined, set it to the number of processors
45
59
if (NOT DEFINED PARALLEL_BUILDS )
46
60
include (ProcessorCount )
Original file line number Diff line number Diff line change @@ -13,9 +13,9 @@ set(WORKING_DIR "${NV_CODEC_HEADERS_GENERATED_SRC_PATH}")
13
13
UNIX_PATH (WORKING_DIR_UNIX ${WORKING_DIR} )
14
14
UNIX_PATH (DEST_DIR_UNIX ${CMAKE_CURRENT_BINARY_DIR} )
15
15
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} "
17
17
# 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"
19
19
WORKING_DIRECTORY ${WORKING_DIR}
20
20
COMMENT "Target: nv-codec-headers"
21
21
COMMAND_EXPAND_LISTS
Original file line number Diff line number Diff line change @@ -43,27 +43,18 @@ endif()
43
43
# configure command will only take the first argument if not converted to string
44
44
string (REPLACE ";" " " FFMPEG_X264_EXTRA_CONFIGURE "${FFMPEG_X264_EXTRA_CONFIGURE} " )
45
45
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
-
55
46
# On Windows, the x264 submodule needs to have line endings converted to LF, see the README.md
56
47
57
48
set (WORKING_DIR "${X264_GENERATED_SRC_PATH} " )
58
49
UNIX_PATH (WORKING_DIR_UNIX ${WORKING_DIR} )
59
50
add_custom_target (x264 ALL
60
- COMMAND ${SHELL_CMD} "${X264_COMPILER_FLAGS } ./configure \
51
+ COMMAND ${SHELL_CMD} "${MAKE_COMPILER_FLAGS } ./configure \
61
52
--prefix=${CMAKE_CURRENT_BINARY_DIR_UNIX} /x264 \
62
53
--disable-cli \
63
54
--enable-static \
64
55
${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"
67
58
WORKING_DIRECTORY ${WORKING_DIR}
68
59
COMMENT "Target: x264"
69
60
COMMAND_EXPAND_LISTS
You can’t perform that action at this time.
0 commit comments