LCXL: Fix the build of CodeXL remote agent for ARM

LCXL: Bump version number.
codeplaysoftware · Sep 7, 2018 · d6e25e6 · d6e25e6
1 parent daae54f
commit d6e25e6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/CodeXL/AMDTApplicationFramework/Include/LPGPU2ApplicationDefs.h b/CodeXL/AMDTApplicationFramework/Include/LPGPU2ApplicationDefs.h
@@ -12,7 +12,7 @@
 
 #define LPGPU2_CODEXL_APPLICATION_VERSION_MAJOR 3
 #define LPGPU2_CODEXL_APPLICATION_VERSION_MINOR 9
-#define LPGPU2_CODEXL_APPLICATION_VERSION_PATCH 2
+#define LPGPU2_CODEXL_APPLICATION_VERSION_PATCH 3
 #define LPGPU2_CODEXL_APPLICATION_VERSION_SUFFIX ""
 
 #endif // LPGPU2_APPLICATION_DEFS_H
diff --git a/CodeXL/SConstruct b/CodeXL/SConstruct
@@ -283,12 +283,14 @@ CXL_env.Depends(LPGPU2FeedbackEngine_Obj, LPGPU2Database_Obj + Lua_Obj + pcre_Ob
 #--KB: LPGPU2
 
 # LPGPU2 Power Model
-LPGPU2PowerModelsBase_Obj = SConscript('Components/PowerProfiling/LPGPU2PowerModeling/LPGPU2PowerModelsBase/SConscript', variant_dir=obj_variant_dir+'/LPGPU2PowerModelsBase', duplicate=1)
+# Only build the Power Model project if it isn't a remote-agent-only-build
+if (CXL_env['CXL_build_only_remote_agent'] == ''):
+ LPGPU2PowerModelsBase_Obj = SConscript('Components/PowerProfiling/LPGPU2PowerModeling/LPGPU2PowerModelsBase/SConscript', variant_dir=obj_variant_dir+'/LPGPU2PowerModelsBase', duplicate=1)
 
-ProfilerCommonPlugins += LPGPU2PowerModelsBase_Obj
+ ProfilerCommonPlugins += LPGPU2PowerModelsBase_Obj
 
-LPGPU2PowerModelsCli_Obj = SConscript('Components/PowerProfiling/LPGPU2PowerModeling/LPGPU2PowerModelsCLI/SConscript', variant_dir=obj_variant_dir+'/LPGPU2PowerModelsCLI', duplicate=1)
-ProfilerCommonPlugins += LPGPU2PowerModelsCli_Obj
+ LPGPU2PowerModelsCli_Obj = SConscript('Components/PowerProfiling/LPGPU2PowerModeling/LPGPU2PowerModelsCLI/SConscript', variant_dir=obj_variant_dir+'/LPGPU2PowerModelsCLI', duplicate=1)
+ ProfilerCommonPlugins += LPGPU2PowerModelsCli_Obj
 
 
 # LPGPU2 Power Model