Jeffnye gh/fsl submodule

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "stf_lib"]
 	path = stf_lib
 	url = https://github.com/sparcians/stf_lib.git
+[submodule "fsl"]
+	path = fsl
+	url = [email protected]:Condor-Performance-Modeling/fsl.git

CMakeLists.txt

@@ -61,15 +61,19 @@ set(CMAKE_CXX_FLAGS_DEBUG     "-O0 -g")
 
 # Include directories
 include_directories (core mss sim)
-include_directories (SYSTEM fusion)
+include_directories (SYSTEM fsl)
 include_directories (SYSTEM mavis)
 include_directories (SYSTEM stf_lib)
 
 # Mavis, the Core, MSS, the simulator and Fusion
+
 add_subdirectory (mavis)
 add_subdirectory (core)
 add_subdirectory (mss)
-add_subdirectory (fusion)
+
+# Tell FSL to use the top mavis submodule, instead of fsl's submodule
+set(FSL_MAVIS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/mavis")
+add_subdirectory (fsl)
 
 # Add STF library to the build
 add_subdirectory (${STF_LIB_BASE})

core/Decode.cpp

@@ -1,7 +1,7 @@
 // <Decode.cpp> -*- C++ -*-
 
 #include "Decode.hpp"
-#include "fusion/FusionTypes.hpp"
+#include "fsl_api/FusionTypes.h"
 
 #include "sparta/events/StartupEvent.hpp"
 #include "sparta/utils/LogUtils.hpp"

core/Decode.hpp

@@ -6,12 +6,12 @@
 #include "FlushManager.hpp"
 #include "InstGroup.hpp"
 
-#include "fusion/FieldExtractor.hpp"
-#include "fusion/Fusion.hpp"
-#include "fusion/FusionGroup.hpp"
-#include "fusion/FusionTypes.hpp"
-#include "fusion/HCache.hpp"
-#include "fusion/MachineInfo.hpp"
+#include "fsl_api/FieldExtractor.h"
+#include "fsl_api/Fusion.h"
+#include "fsl_api/FusionGroup.h"
+#include "fsl_api/FusionTypes.h"
+#include "fsl_api/HCache.h"
+#include "fsl_api/MachineInfo.h"
 
 #include "sparta/ports/DataPort.hpp"
 #include "sparta/events/UniqueEvent.hpp"

core/FusionDecode.cpp

@@ -1,6 +1,7 @@
 // TODO: add Condor header - this is a new file
 // contact jeff at condor
-#include "fusion/FusionTypes.hpp"
+//#include "fusion/FusionTypes.hpp"
+#include "fsl_api/FusionTypes.h"
 #include "Decode.hpp"
 
 #include "sparta/events/StartupEvent.hpp"