From c44b4a43560cb537ccb70517857b3751568fb85e Mon Sep 17 00:00:00 2001
From: Maneesh Gupta <maneesh.gupta@amd.com>
Date: Wed, 4 May 2016 14:44:00 +0530
Subject: [PATCH] Modify cmake for better clang hipify integration

---
 CMakeLists.txt | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13e6fb8485..42f203cf0d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,15 +8,6 @@ set(HIP_VERSION_MAJOR "0")
 set(HIP_VERSION_MINOR "84")
 set(HIP_VERSION_PATCH "0")
 
-
-if(NOT DEFINED BUILD_CLANG_HIPIFY)
-    set(BUILD_CLANG_HIPIFY 0)
-endif()
-
-if(BUILD_CLANG_HIPIFY)
-    add_subdirectory(clang-hipify)
-endif()
-
 #############################
 # Configure variables
 #############################
@@ -91,9 +82,23 @@ else()
     set(HIP_USE_SHARED_LIBRARY $ENV{HIP_USE_SHARED_LIBRARY})
 endif()
 
+# Check if we need to build clang hipify
+if(NOT DEFINED BUILD_CLANG_HIPIFY)
+    if(NOT DEFINED ENV{BUILD_CLANG_HIPIFY})
+        set(BUILD_CLANG_HIPIFY 0)
+    else()
+        set(BUILD_CLANG_HIPIFY $ENV{BUILD_CLANG_HIPIFY})
+    endif()
+endif()
+
 #############################
 # Build steps
 #############################
+# Build clang hipify if enabled
+if(BUILD_CLANG_HIPIFY)
+    add_subdirectory(clang-hipify)
+endif()
+
 # Build hip_hcc if platform is hcc
 if(HIP_PLATFORM STREQUAL "hcc")
     include_directories(${PROJECT_SOURCE_DIR}/include)