Merge pull request #28 from ktechlab/fix-compilation-on-kdevplatform-1.6

Fix compilation on kdevplatform 1.6
ktechlab · May 15, 2014 · b65fb14 · b65fb14
2 parents 2947616 + b520a28
commit b65fb14
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 10 deletions.
diff --git a/cmake/modules/FindGPSim.cmake b/cmake/modules/FindGPSim.cmake
@@ -31,10 +31,31 @@ set( CMAKE_REQUIRED_FLAGS
 	-fexceptions
 	)
 
+INCLUDE( CheckIncludeFileCXX )
 
-# HAVE_GPSIM_0_21_12
+# TODO add a GPSIM_VERSION variable here, and then check that in the code
 
-INCLUDE( CheckIncludeFileCXX )
+# HAVE_GPSIM_0_27
+
+CHECK_INCLUDE_FILE_CXX( ${GPSim_INCLUDE_DIR}/p12f182x.h HAVE_GPSIM_0_27 )
+
+if( HAVE_GPSIM_0_27 )
+	message( STATUS "GPSim 0.27 found" )
+	set( HAVE_GPSIM_0_27 "GPSim 0.27 found" )
+	set( GPSIM_INCLUDE_DIRS
+		${GPSim_INCLUDE_DIR}
+		${GLIB2_INCLUDE_DIRS}
+		)
+	set( GPSIM_LIBRARY
+		${GPSim_LIBRARY}
+		${GLIB2_LIBRARY}
+		)
+	set( GPSIM_FOUND TRUE )
+	return()
+endif( HAVE_GPSIM_0_27 )
+
+
+# HAVE_GPSIM_0_21_12
 
 CHECK_INCLUDE_FILE_CXX( ${GPSim_INCLUDE_DIR}/ValueCollections.h HAVE_GPSIM_0_21_12 )
 

diff --git a/cmake/modules/KDevPluginVersion.cmake b/cmake/modules/KDevPluginVersion.cmake
@@ -1,12 +1,46 @@
 
-find_file( KDEV_IPLUGIN_H kdevplatform/interfaces/iplugin.h )
-
-if(KDEV_IPLUGIN_H)
-	file(STRINGS ${KDEV_IPLUGIN_H} KDEV_PLUGIN_VERSION
-		REGEX "#define KDEVELOP_PLUGIN_VERSION.*" )
-	string(REGEX REPLACE ".*\\ ([0-9]+)"
-		"\\1" KDEV_PLUGIN_VERSION ${KDEV_PLUGIN_VERSION})
-endif(KDEV_IPLUGIN_H)
+set(KDEV_PLUGIN_VERSION_FOUND FALSE)
+
+# 1. try
+if(NOT KDEV_PLUGIN_VERSION_FOUND)
+
+	find_file( KDEV_IPLUGIN_H kdevplatform/interfaces/iplugin.h )
+
+	if(KDEV_IPLUGIN_H)
+		file(STRINGS ${KDEV_IPLUGIN_H} KDEV_PLUGIN_VERSION
+			REGEX "#define KDEVELOP_PLUGIN_VERSION.*" )
+		message(STATUS "KDEV_PLUGIN_VERSION (1): " ${KDEV_PLUGIN_VERSION} )
+		if (NOT "${KDEV_PLUGIN_VERSION}" STREQUAL "")
+			# KDevPlatform < 1.6
+			string(REGEX REPLACE ".*\\ ([0-9]+)"  "\\1"
+				KDEV_PLUGIN_VERSION ${KDEV_PLUGIN_VERSION} )
+			message(STATUS "KDEV_PLUGIN_VERSION (1) set: " ${KDEV_PLUGIN_VERSION} )
+			set(KDEV_PLUGIN_VERSION_FOUND TRUE)
+		endif(NOT "${KDEV_PLUGIN_VERSION}" STREQUAL "")
+	endif(KDEV_IPLUGIN_H)
+
+endif(NOT KDEV_PLUGIN_VERSION_FOUND)
+
+# 2. try
+if(NOT KDEV_PLUGIN_VERSION_FOUND)
+
+	find_file( KDEV_IPLUGINVERSION_H kdevplatform/interfaces/ipluginversion.h )
+
+	if (KDEV_IPLUGINVERSION_H)
+		file(STRINGS ${KDEV_IPLUGINVERSION_H} KDEV_PLUGIN_VERSION
+			REGEX "#define KDEVELOP_PLUGIN_VERSION.*" )
+		message(STATUS "KDEV_PLUGIN_VERSION (2): " ${KDEV_PLUGIN_VERSION} )
+		if (NOT "${KDEV_PLUGIN_VERSION}" STREQUAL "")
+			# KDevPlatform >= 1.6
+			string(REGEX REPLACE ".*\\ ([0-9]+)"  "\\1"
+				KDEV_PLUGIN_VERSION ${KDEV_PLUGIN_VERSION} )
+			message(STATUS "KDEV_PLUGIN_VERSION (2) set: " ${KDEV_PLUGIN_VERSION} )
+			set(KDEV_PLUGIN_VERSION_FOUND TRUE)
+		endif(NOT "${KDEV_PLUGIN_VERSION}" STREQUAL "")
+	endif (KDEV_IPLUGINVERSION_H)
+
+endif(NOT KDEV_PLUGIN_VERSION_FOUND)
+
 
 if(NOT DEFINED KDEV_PLUGIN_VERSION)
 	message(WARNING "KDEVELOP plugin version cannot be determined, guessing..." )

diff --git a/config.h.cmake b/config.h.cmake
@@ -4,4 +4,5 @@
 #cmakedefine HAVE_GPSIM_0_21_4
 #cmakedefine HAVE_GPSIM_0_21_11
 #cmakedefine HAVE_GPSIM_0_21_12
+#cmakedefine HAVE_GPSIM_0_27
 #cmakedefine GPSIM_FOUND
diff --git a/src/lib/simulator/electronics/gpsimprocessor.cpp b/src/lib/simulator/electronics/gpsimprocessor.cpp
@@ -763,7 +763,12 @@ RegisterSet::RegisterSet( pic_processor * picProcessor )
 		m_nameToRegisterMap[ info->name() ] = info;
 	}
 
+#ifdef HAVE_GPSIM_0_27
+	RegisterInfo * info = new RegisterInfo( picProcessor->Wreg );
+#else // before version 0.27
 	RegisterInfo * info = new RegisterInfo( picProcessor->W );
+#endif
+
 	m_registers.append( info );
 	m_nameToRegisterMap[ info->name() ] = info;
 }

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -148,7 +148,10 @@ void MainWindow::init()
 
     controller()->showArea(m_mainArea,this);
 
+#if KDEV_PLUGIN_VERSION < 16
+	// TODO see why do we need this
     setupAreaSelector();
+#endif
 }
 
 void MainWindow::slotFileNewAssembly()