ConfigureChecks.cmake

@@ -201,25 +201,8 @@ endif ( BUILD_KSIM )
 if ( BUILD_SUPERKARAMBA )
   check_include_file( "sys/types.h" HAVE_SYS_TYPES_H )
 
-  if( ${CMAKE_VERSION} VERSION_LESS "3.12" )
   find_package( PythonLibs )
-    if( NOT PYTHONLIBS_FOUND )
-      tde_message_fatal( "Python is required, but was not found on your system" )
-    endif( NOT PYTHONLIBS_FOUND )
-  else( )
-    find_package( Python COMPONENTS Development )
-    if( NOT Python_Development_FOUND )
-      tde_message_fatal( "Python is required, but was not found on your system" )
-    endif( )
-    set( PYTHONLIBS_VERSION_STRING "${Python_VERSION}" )
-    set( PYTHON_VERSION_STRING "${Python_VERSION}" )
-    set( PYTHON_VERSION_MAJOR  "${Python_VERSION_MAJOR}" )
-    set( PYTHON_VERSION_MINOR  "${Python_VERSION_MINOR}" )
-    set( PYTHON_INCLUDE_DIRS   "${Python_INCLUDE_DIRS}" )
-    set( PYTHON_LIBRARIES      "${Python_LIBRARIES}" )
-  endif( )
-
-  if( "${PYTHONLIBS_VERSION_STRING}" LESS "3" )
+  if( NOT PYTHONLIBS_FOUND OR "${PYTHONLIBS_VERSION_STRING}" LESS "3" )
     tde_message_fatal( "Python3 is required, but was not found on your system" )
   endif( )
 

ksim/monitors/snmp/pdu.cpp

@@ -48,7 +48,7 @@ PDU::~PDU()
 void PDU::addNullVariables( const IdentifierList &oids )
 {
     std::for_each( oids.begin(), oids.end(),
-                   std::bind( std::mem_fn( &PDU::addNullVariable ), this, std::placeholders::_1 ) );
+                   std::bind1st( std::mem_fun( &PDU::addNullVariable ), this ) );
 }
 
 void PDU::addNullVariable( Identifier oid )

ksim/monitors/snmp/walker.cpp

@@ -29,7 +29,7 @@ using namespace KSim::Snmp;
 namespace
 {
     template <class T>
-    struct Deleter : public std::function<void(T)>
+    struct Deleter : public std::unary_function<T, void>
     {
         void operator()( T arg )
         { delete arg; }

superkaramba/examples/globalMouse/CMakeLists.txt

@@ -1,7 +1,7 @@
 ##### xcursor.so #######################
 
 include_directories(
-  ${PYTHON_INCLUDE_DIRS}
+  ${PYTHON_INCLUDE_DIR}
 )
 
 tde_add_library( xcursor MODULE NO_LIBTOOL_FILE