Merge branch 'develop' of https://github.com/r-potter/openexr into r-…

…potter-develop
AcademySoftwareFoundation · Jul 26, 2016 · b206a24 · b206a24
2 parents bc372d4 + 8eed701
commit b206a24
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/IlmBase/Half/CMakeLists.txt b/IlmBase/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)