diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2017-06-25 21:07:58 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2017-06-25 21:07:58 +0000 |
| commit | 5e373eaa92fd3a243e1bc7a8e3eaf114ab1eeabf (patch) | |
| tree | 3291541f3b73432c893dec35f4f23770dd07732a /graphics/ilmbase | |
| parent | 9c92503171817f96d944009b9ea88d3c083c9a45 (diff) | |
| download | ports-5e373eaa92fd3a243e1bc7a8e3eaf114ab1eeabf.tar.gz ports-5e373eaa92fd3a243e1bc7a8e3eaf114ab1eeabf.zip | |
Make ninja opt-out in cmake.mk
Using ninja instead of make (1) can lead to significant speed ups while building.
Therefore switch from having the ninja generator opt-in to having it opt-out.
Previously cmake-ports that wanted to use ninja could set
CMAKE_NINJA=yes
now, ports that do not work with ninja can set
cmake:<existing args>,noninja
Note, that needing this should be an exception and most often points to a broken
cmake of the port.
The ports using cmake were modified
* removed USES=gmake, if ninja is used
* removed MAKE_ARGS, if ninja is used
* added the cmake-argument noninja if necessary
PR: 219629
PR: 213331
Exp-run by: antoine
Reviewed by: rakuco
Differential Revision: https://reviews.freebsd.org/D10748
Notes
Notes:
svn path=/head/; revision=444324
Diffstat (limited to 'graphics/ilmbase')
| -rw-r--r-- | graphics/ilmbase/files/patch-git_8eed7012 | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/graphics/ilmbase/files/patch-git_8eed7012 b/graphics/ilmbase/files/patch-git_8eed7012 new file mode 100644 index 000000000000..dbbcd85ec4a0 --- /dev/null +++ b/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) |