[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks] staging/kde4support/src: Simplify a configure check.
From:       Stephen Kelly <steveire () gmail ! com>
Date:       2013-09-05 19:01:58
Message-ID: E1VHeoY-0004FU-6Q () scm ! kde ! org
[Download RAW message or body]

Git commit e828546ff88151fd43c11a10798dc7877645ca09 by Stephen Kelly.
Committed on 05/09/2013 at 15:35.
Pushed by skelly into branch 'frameworks'.

Simplify a configure check.

None of this extra stuff is needed since CMake 2.8.11 and Qt 5.1.

M  +5    -18   staging/kde4support/src/ConfigureChecks.cmake

http://commits.kde.org/kdelibs/e828546ff88151fd43c11a10798dc7877645ca09

diff --git a/staging/kde4support/src/ConfigureChecks.cmake b/staging/kde4su=
pport/src/ConfigureChecks.cmake
index 578277c..21cac3f 100644
--- a/staging/kde4support/src/ConfigureChecks.cmake
+++ b/staging/kde4support/src/ConfigureChecks.cmake
@@ -19,18 +19,8 @@ set( KDELIBSUFF ${LIB_SUFFIX} )
 # checks below.
 set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS})
 =

-cmake_push_check_state()
-  set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${QT_INCLUDES}")
-  if (QT_USE_FRAMEWORKS)
-    set(CMAKE_REQUIRED_FLAGS "-F${QT_LIBRARY_DIR} ")
-  endif (QT_USE_FRAMEWORKS)
-  set (CMAKE_CXX_FLAGS_SAVED "${CMAKE_CXX_FLAGS}")
-
-  # If Qt is built with reduce-relocations (The default) we need to add -f=
PIE here.
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FL=
AGS}")
-
-  set(CMAKE_REQUIRED_LIBRARIES Qt5::Network)
-  check_cxx_source_compiles(
+set(CMAKE_REQUIRED_LIBRARIES Qt5::Network)
+check_cxx_source_compiles(
 "#include <QtNetwork/QSslSocket>
 int main()
 {
@@ -38,12 +28,9 @@ int main()
     return 0;
 }" HAVE_QSSLSOCKET)
 =

-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_SAVED}")
-
-  if (NOT HAVE_QSSLSOCKET)
-     message(FATAL_ERROR "KDE Requires Qt to be built with SSL support")
-  endif (NOT HAVE_QSSLSOCKET)
-cmake_pop_check_state()
+if (NOT HAVE_QSSLSOCKET)
+   message(FATAL_ERROR "KDE Requires Qt to be built with SSL support")
+endif (NOT HAVE_QSSLSOCKET)
 =

 check_include_files("sys/types.h;sys/socket.h;net/if.h" HAVE_NET_IF_H)
 check_include_files("sys/filio.h" HAVE_SYS_FILIO_H)
[prev in list] [next in list] [prev in thread] [next in thread]