Commit 85a4bf9c authored by Ahmad Samir's avatar Ahmad Samir
Browse files

Buildsystem clean up

sstream header should be available on all platforms this is built on.
parent a6050821
Pipeline #188775 passed with stage
in 1 minute and 47 seconds
......@@ -31,9 +31,6 @@ find_package(X11 REQUIRED COMPONENTS xf86vmode)
# X11_xf86vmode discovery is done by FindX11
add_feature_info("X11_xf86vmode" X11_xf86vmode_FOUND "Required to build kgamma.")
# check_include_files(strstream HAVE_STRSTREAM_H)
configure_file(config-kgamma.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kgamma.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
......
/* define to 1 if you have strstream */
#cmakedefine HAVE_STRSTREAM_H
......@@ -6,7 +6,6 @@
#include "kgamma.h"
#include "config-kgamma.h"
#include "gammactrl.h"
#include "xf86configpath.h"
#include <unistd.h>
......
......@@ -10,18 +10,10 @@
#include <iostream>
#include <stdlib.h>
#include <sstream>
#include <string>
#include <vector>
#include "config-kgamma.h"
#if !defined(HAVE_STRSTREAM_H)
#include <sstream>
#else
#include <strstream.h>
#define istringstream istrstream
#endif
#include "xf86configpath.h"
#include <X11/Xlib.h>
......@@ -183,7 +175,3 @@ void XVidExtWrap::setGammaLimits(float min, float max)
mingamma = (min < 0.1) ? 0.1 : min;
maxgamma = (max > 10.0) ? 10.0 : max;
}
#ifdef istringstream
#undef istringstream
#endif
......@@ -10,18 +10,10 @@
#include <fstream>
#include <iostream>
#include <sstream>
#include <string>
#include <vector>
#include "config-kgamma.h"
#if !defined(HAVE_STRSTREAM_H)
#include <sstream>
#else
#include <strstream.h>
#define istringstream istrstream
#endif
using namespace std;
int main(int argc, char *argv[])
......@@ -125,7 +117,3 @@ int main(int argc, char *argv[])
return !success;
}
#ifdef istringstream
#undef istringstream
#endif
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment