diff options
| author | rakuco <rakuco@FreeBSD.org> | 2015-08-18 18:51:01 +0800 |
|---|---|---|
| committer | rakuco <rakuco@FreeBSD.org> | 2015-08-18 18:51:01 +0800 |
| commit | 4f4c3f4858e41faac2d9b5883898c35afbe1c327 (patch) | |
| tree | ce0de1d0b7bda5eb762e64fe58300177d350898c /Mk/Uses | |
| parent | 8a49f8f056abc122912107313fddc7b1ea728c39 (diff) | |
| download | freebsd-ports-gnome-4f4c3f4858e41faac2d9b5883898c35afbe1c327.tar.gz freebsd-ports-gnome-4f4c3f4858e41faac2d9b5883898c35afbe1c327.tar.zst freebsd-ports-gnome-4f4c3f4858e41faac2d9b5883898c35afbe1c327.zip | |
Uses/cmake.mk: Replace CMAKE_ENV with CONFIGURE_ENV.
Instead of defining a variable that is almost always based on CONFIGURE_ENV,
just use CONFIGURE_ENV directly.
This also matches the behavior of other ports that do not use autotools (so
most ports can just worry about CONFIGURE_ENV). Additionally, the fact that
we do not use ?= means we do not have problems if another file in Uses/
needs to set CONFIGURE_ENV (with CMAKE_ENV, the order of the arguments to
USES would matter).
Ports which set CMAKE_ENV have been adjusted accordingly. In most cases,
CMAKE_ENV was just replaced with CONFIGURE_ENV, the exceptions being:
* databases/sqliteman: CMAKE_ENV line removed; setting QMAKESPEC there has
no effect on the build system.
* devel/freeocl: CMAKE_ENV line removed; FREEOCL_CXX_COMPILER is already
retrieved from the CMAKE_CXX_COMPILER variable in the build
system.
* graphics/openimageio: CMAKE_ENV line removed; setting Qt variables there
has no effect on the build system.
Reviewed by: makc
Differential Revision: https://reviews.freebsd.org/D3403
Diffstat (limited to 'Mk/Uses')
| -rw-r--r-- | Mk/Uses/cmake.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk index 00b0671fbc94..666481cc6623 100644 --- a/Mk/Uses/cmake.mk +++ b/Mk/Uses/cmake.mk @@ -19,8 +19,6 @@ # CMAKE_NINJA - Use ninja instead of make(1) # # Variables for ports: -# CMAKE_ENV - Environment passed to cmake. -# Default: ${CONFIGURE_ENV} # CMAKE_ARGS - Arguments passed to cmake # Default: see below # CMAKE_BUILD_TYPE - Type of build (cmake predefined build types). @@ -68,7 +66,6 @@ PLIST_SUB+= CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:tl}" INSTALL_TARGET?= install/strip .endif -CMAKE_ENV?= ${CONFIGURE_ENV} CMAKE_ARGS+= -DCMAKE_C_COMPILER:STRING="${CC}" \ -DCMAKE_CXX_COMPILER:STRING="${CXX}" \ -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ @@ -117,7 +114,7 @@ INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} do-configure: @${ECHO_MSG} ${_CMAKE_MSG} ${MKDIR} ${CONFIGURE_WRKSRC} - @cd ${CONFIGURE_WRKSRC}; ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} + @cd ${CONFIGURE_WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} .endif .endif #!defined(_INCLUDE_USES_CMAKE_MK) |