diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt
index f7390c7734..eb2ac7e79d 100644
--- a/hipamd/CMakeLists.txt
+++ b/hipamd/CMakeLists.txt
@@ -1,9 +1,15 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(hip)
 
+#############################
+# Setup config generation
+#############################
 string(TIMESTAMP _timestamp UTC)
 set(_versionInfo "# Auto-generated by cmake\n")
 set(_buildInfo "# Auto-generated by cmake on ${_timestamp} UTC\n")
+macro(add_to_config _configfile _variable)
+    set(${_configfile} "${${_configfile}}${_variable}=${${_variable}}\n")
+endmacro()
 
 #############################
 # Setup version information
@@ -28,7 +34,9 @@ execute_process(COMMAND git show -s --format=@%ct
                 OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 set(HIP_VERSION $HIP_VERSION_MAJOR.$HIP_VERSION_MINOR.$HIP_VERSION_PATCH)
-set(_versionInfo "${_versionInfo}HIP_VERSION_MAJOR=${HIP_VERSION_MAJOR}\nHIP_VERSION_MINOR=${HIP_VERSION_MINOR}\nHIP_VERSION_PATCH=${HIP_VERSION_PATCH}\n")
+add_to_config(_versionInfo HIP_VERSION_MAJOR)
+add_to_config(_versionInfo HIP_VERSION_MINOR)
+add_to_config(_versionInfo HIP_VERSION_PATCH)
 
 #############################
 # Configure variables
@@ -56,7 +64,7 @@ if(HIP_PLATFORM STREQUAL "hcc")
         endif()
     endif()
     if(DEFINED ENV{HIP_DEVELOPER})
-        set(_buildInfo "${_buildInfo}HCC_HOME=${HCC_HOME}\n")
+        add_to_config(_buildInfo HCC_HOME)
     endif()
     if(IS_ABSOLUTE ${HCC_HOME} AND EXISTS ${HCC_HOME} AND IS_DIRECTORY ${HCC_HOME})
         execute_process(COMMAND ${HCC_HOME}/bin/hcc --version
@@ -67,7 +75,7 @@ if(HIP_PLATFORM STREQUAL "hcc")
     else()
         message(FATAL_ERROR "Don't know where to find HCC. Please specify abolute path using -DHCC_HOME")
     endif()
-    set(_buildInfo "${_buildInfo}HCC_VERSION=${HCC_VERSION}\n")
+    add_to_config(_buildInfo HCC_VERSION)
 
     # Determine HSA_PATH
     if(NOT DEFINED HSA_PATH)
@@ -129,6 +137,7 @@ if(NOT DEFINED COMPILE_HIP_ATP_MARKER)
         set(COMPILE_HIP_ATP_MARKER $ENV{COMPILE_HIP_ATP_MARKER})
     endif()
 endif()
+add_to_config(_buildInfo COMPILE_HIP_ATP_MARKER)
 
 #############################
 # Build steps