CMake changes for Ninja

Author: umar456

CMakeLists.txt

@@ -2,6 +2,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
 PROJECT(ARRAYFIRE)
 
 SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
+if(POLICY CMP0058)
+  CMAKE_POLICY(SET CMP0058 NEW)
+endif(POLICY CMP0058)
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 INCLUDE(UploadCoveralls)

CMakeModules/build_cl2hpp.cmake

@@ -2,9 +2,19 @@ INCLUDE(ExternalProject)
 
 SET(prefix ${PROJECT_BINARY_DIR}/third_party/cl2hpp)
 
+IF(CMAKE_VERSION VERSION_LESS 3.2)
+    IF(CMAKE_GENERATOR MATCHES "Ninja")
+        MESSAGE(WARNING "Building forge with Ninja has known issues with CMake older than 3.2")
+    endif()
+    SET(byproducts)
+ELSE()
+    SET(byproducts BUILD_BYPRODUCTS "${prefix}/package/CL/cl2.hpp")
+ENDIF()
+
 ExternalProject_Add(
     cl2hpp-ext
     GIT_REPOSITORY https://github.com/KhronosGroup/OpenCL-CLHPP.git
+    ${byproducts}
     GIT_TAG 75bb7d0d8b2ffc6aac0a3dcaa22f6622cab81f7c
     PREFIX "${prefix}"
     INSTALL_DIR "${prefix}/package"

CMakeModules/build_clBLAS.cmake

@@ -8,13 +8,14 @@ IF(CMAKE_VERSION VERSION_LESS 3.2)
     endif()
     SET(byproducts)
 ELSE()
-    SET(byproducts BYPRODUCTS ${clBLAS_location})
+    SET(byproducts BUILD_BYPRODUCTS ${clBLAS_location})
 ENDIF()
 
 ExternalProject_Add(
     clBLAS-ext
     GIT_REPOSITORY https://github.com/arrayfire/clBLAS.git
     GIT_TAG arrayfire-release
+    ${byproducts}
     PREFIX "${prefix}"
     INSTALL_DIR "${prefix}"
     UPDATE_COMMAND ""
@@ -30,7 +31,6 @@ ExternalProject_Add(
     -DBUILD_TEST:BOOL=OFF
     -DBUILD_KTEST:BOOL=OFF
     -DSUFFIX_LIB:STRING=
-    ${byproducts}
     )
 
 ExternalProject_Get_Property(clBLAS-ext install_dir)

CMakeModules/build_clFFT.cmake

@@ -8,7 +8,7 @@ IF(CMAKE_VERSION VERSION_LESS 3.2)
     endif()
     SET(byproducts)
 ELSE()
-    SET(byproducts BYPRODUCTS ${clFFT_location})
+    SET(byproducts BUILD_BYPRODUCTS ${clFFT_location})
 ENDIF()
 
 ExternalProject_Add(

CMakeModules/build_forge.cmake

@@ -6,7 +6,7 @@ ELSE(USE_SYSTEM_GLBINDING)
     SET(GLBINDING_TARGET glbinding)
 ENDIF(USE_SYSTEM_GLBINDING)
 
-SET(prefix ${PROJECT_BINARY_DIR}/third_party/forge)
+SET(prefix ${CMAKE_BINARY_DIR}/third_party/forge)
 
 # FIXME: Cannot use $<CONFIG> generator expression here because add_custom_command
 #        does not yet support it for the OUTPUT argument, see also:
@@ -39,7 +39,11 @@ IF(CMAKE_VERSION VERSION_LESS 3.2)
     endif()
     SET(byproducts)
 ELSE()
-    SET(byproducts BYPRODUCTS ${forge_location})
+    IF   (WIN32)
+        SET(byproducts BUILD_BYPRODUCTS third_party/forge/lib/forge${CMAKE_STATIC_LIBRARY_SUFFIX})
+    ELSE (WIN32)
+        SET(byproducts BUILD_BYPRODUCTS ${forge_location})
+    ENDIF(WIN32)
 ENDIF()
 
 SET(FORGE_VERSION 0.9.2)
@@ -49,6 +53,7 @@ ExternalProject_Add(
     forge-ext
     GIT_REPOSITORY https://github.com/arrayfire/forge.git
     GIT_TAG v${FORGE_VERSION}
+    ${byproducts}
     PREFIX "${prefix}"
     INSTALL_DIR "${prefix}"
     UPDATE_COMMAND ""
@@ -69,7 +74,6 @@ ExternalProject_Add(
     -DFREEIMAGE_STATIC_LIBRARY:PATH=${FREEIMAGE_STATIC_LIBRARY}
     -DUSE_FREEIMAGE_STATIC:BOOL=${USE_FREEIMAGE_STATIC}
     BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${forge_lib_config}
-    ${byproducts}
     )
 
 ExternalProject_Get_Property(forge-ext binary_dir)

CMakeModules/build_glbinding.cmake

@@ -15,7 +15,7 @@ IF(CMAKE_VERSION VERSION_LESS 3.2)
     endif()
     SET(byproducts)
 ELSE()
-    SET(byproducts BYPRODUCTS ${glbinding_location})
+    SET(byproducts BUILD_BYPRODUCTS ${glbinding_location})
 ENDIF()
 
 IF(UNIX)

src/backend/cpu/CMakeLists.txt

@@ -191,6 +191,7 @@ IF(DEFINED BLAS_SYM_FILE)
     TARGET_LINK_LIBRARIES(afcpu PUBLIC $<TARGET_FILE:afcpu_static>)
   ELSE(APPLE)
     add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/afcpu_static.renamed
+      BYPRODUCTS ${PROJECT_BINARY_DIR}/afcpu_static.renamed
       COMMAND objcopy --redefine-syms ${BLAS_SYM_FILE} $<TARGET_FILE:afcpu_static> ${PROJECT_BINARY_DIR}/afcpu_static.renamed
       DEPENDS $<TARGET_FILE:afcpu_static>)
       TARGET_LINK_LIBRARIES(afcpu PUBLIC ${PROJECT_BINARY_DIR}/afcpu_static.renamed)