[Autobackout][Manual]Revert of change: 14b6625

Moving IntrinsicGenISA.gen to build Config folder and adding proper dependency requirement

Change-Id: Ifb6019b51780bc30e4130cecd5cf823bc974dcf6

Author: paigeale

IGC/CMakeLists.txt

@@ -3378,8 +3378,6 @@ include_directories(
 
     "${IGC_OPTION__OUTPUT_DIR}"
 
-    "${IGC_BUILD__IGC_BIN_DIR}/${CMAKE_CFG_INTDIR}"
-
     "${IGC_BUILD__IGC_SRC_DIR}/AdaptorOCL/ocl_igc_shared/executable_format"
     "${IGC_BUILD__IGC_SRC_DIR}/AdaptorOCL"
     )

IGC/GenISAIntrinsics/CMakeLists.txt

@@ -4,11 +4,11 @@ set(IGC_BUILD__PROJ__GenISAIntrinsics       "${IGC_BUILD__PROJ__GenISAIntrinsics
 
 set(IGC_BUILD__PROJ_LABEL__GenISAIntrinsics "${IGC_BUILD__PROJ__GenISAIntrinsics}")
 
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
+
 # IntrinsicGenISA.gen is generated by python script and will be included
 # by GenIntrinsics.h
-set(_fileOutput "${IGC_BUILD__IGC_BIN_DIR}/${CMAKE_CFG_INTDIR}/IntrinsicGenISA.gen")
-
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
+set(_fileOutput "${IGC_OPTION__OUTPUT_DIR}/IntrinsicGenISA.gen")
 
 set(IGC_BUILD__SRC__GenISAIntrinsics
     "${CMAKE_CURRENT_SOURCE_DIR}/GenIntrinsics.cpp"
@@ -45,8 +45,6 @@ add_custom_command(OUTPUT "${_fileOutput}"
     COMMENT "Generating Gen intrinsic definition file: ${_fileOutput}"
   )
 
-add_dependencies("${IGC_BUILD__PROJ__GenISAIntrinsics}" "${_fileOutput}")
-
 #set up standard defines from the common WDK path.
 if(MSVC)
     bs_set_wdk(${IGC_BUILD__PROJ__GenISAIntrinsics})