Page MenuHomeFreeBSD
Files F159545306

D10748.id28380.diff
No OneTemporary
Actions

D10748.id28380.diff
View Options

Index: Mk/Uses/cmake.mk
===================================================================
--- Mk/Uses/cmake.mk
+++ Mk/Uses/cmake.mk
@@ -4,9 +4,11 @@
#
# Feature: cmake
# Usage: USES=cmake or USES=cmake:ARGS
-# Valid ARGS: outsource
+# Valid ARGS: outsource, run, noninja
# ARGS description:
# outsource perform an out-of-source build
+# noninja don't use ninja instead of make
+# run add a runtime dependency on cmake
#
#
# Additional variables that affect cmake behaviour:
@@ -14,7 +16,6 @@
# User defined variables:
# CMAKE_NOCOLOR - Disable colour build output
# Default: not set, unless BATCH or PACKAGE_BUILDING is defined
-# CMAKE_NINJA - Use ninja instead of make(1)
#
# Variables for ports:
# CMAKE_ARGS - Arguments passed to cmake
@@ -36,7 +37,7 @@
.if !defined(_INCLUDE_USES_CMAKE_MK)
_INCLUDE_USES_CMAKE_MK= yes
-_valid_ARGS= outsource run
+_valid_ARGS= outsource run noninja
# Sanity check
.for arg in ${cmake_ARGS}
@@ -91,7 +92,7 @@
CMAKE_ARGS+= -DCMAKE_COLOR_MAKEFILE:BOOL=OFF
.endif
-.if defined(CMAKE_NINJA)
+.if empty(cmake_ARGS:Mnoninja)
.include "${USESDIR}/ninja.mk"
.endif
Index: graphics/ilmbase/files/patch-git_8eed7012
===================================================================
--- /dev/null
+++ graphics/ilmbase/files/patch-git_8eed7012
@@ -0,0 +1,59 @@
+From 8eed7012c10f1a835385d750fd55f228d1d35df9 Mon Sep 17 00:00:00 2001
+From: Ralph Potter <r.potter@bath.ac.uk>
+Date: Wed, 5 Nov 2014 16:16:55 +0000
+Subject: [PATCH] Resolve dependency issue building eLut.h/toFloat.h with
+ CMake/Ninja.
+
+---
+ IlmBase/Half/CMakeLists.txt | 23 +++++++++++------------
+ 1 file changed, 11 insertions(+), 12 deletions(-)
+
+diff --git a/IlmBase/Half/CMakeLists.txt b/IlmBase/Half/CMakeLists.txt
+index 6f9714d..958d1b0 100644
+--- Half/CMakeLists.txt
++++ Half/CMakeLists.txt
+@@ -1,23 +1,24 @@
+ # yue.nicholas@gmail.com
+
+ ADD_EXECUTABLE ( eLut eLut.cpp )
+-
+-ADD_CUSTOM_COMMAND (
+- TARGET eLut POST_BUILD
+- COMMAND eLut > ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
++ADD_CUSTOM_COMMAND(
++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
++ COMMAND eLut ARGS > ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
++ DEPENDS eLut
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-)
++ )
+ SET_SOURCE_FILES_PROPERTIES(
+ ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
+ PROPERTIES HEADER_FILE_ONLY TRUE
+ )
+
+ ADD_EXECUTABLE ( toFloat toFloat.cpp )
+-ADD_CUSTOM_COMMAND (
+- TARGET toFloat POST_BUILD
+- COMMAND toFloat > ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
++ADD_CUSTOM_COMMAND(
++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
++ COMMAND toFloat ARGS > ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
++ DEPENDS toFloat
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-)
++ )
+ SET_SOURCE_FILES_PROPERTIES(
+ ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
+ PROPERTIES HEADER_FILE_ONLY TRUE
+@@ -27,9 +28,7 @@ SET_SOURCE_FILES_PROPERTIES(
+ half.cpp
+ PROPERTIES
+ OBJECT_DEPENDS
+- ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
+- OBJECT_DEPENDS
+- ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
++ "${CMAKE_CURRENT_BINARY_DIR}/eLut.h;${CMAKE_CURRENT_BINARY_DIR}/toFloat.h"
+ )
+
+ IF(BUILD_SHARED_LIBS)

File Metadata

Mime Type
text/plain
Expires
Tue, Jun 16, 2:15 PM (5 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33989379
Default Alt Text
D10748.id28380.diff (3 KB)

Event Timeline