Browse Source

Fix FTBFS due to late includes in CMake

tags/r14.0.0
Slávek Banko 5 years ago
parent
commit
e39b3d2d65
1 changed files with 10 additions and 13 deletions
  1. +10
    -13
      CMakeLists.txt

+ 10
- 13
CMakeLists.txt View File

@@ -12,6 +12,15 @@
cmake_minimum_required( VERSION 2.8 )


##### include essential cmake modules ###########

include( CheckCXXSourceCompiles )
include( CheckFunctionExists )
include( CheckIncludeFile )
include( CheckLibraryExists )
include( FindPkgConfig )


##### include our cmake modules #################
set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEMacros )
@@ -56,8 +65,6 @@ tde_setup_architecture_flags( )

##### check for include files ###################

include( CheckIncludeFile )

check_include_file( "sys/time.h" HAVE_SYS_TIME_H )
check_include_file( "time.h" TIME_WITH_SYS_TIME )
check_include_file( "stdio.h" HAVE_STDIO_H )
@@ -74,8 +81,6 @@ check_include_file( "pthread.h" HAVE_LIBPTHREAD )

##### check for system libraries ################

include( CheckLibraryExists )

set( DL_LIBRARIES dl )
check_library_exists( ${DL_LIBRARIES} dlopen /lib HAVE_LIBDL )
if( NOT HAVE_LIBDL )
@@ -88,9 +93,8 @@ endif( NOT HAVE_LIBDL )

find_package( Threads )

##### check for functions #######################

include( CheckFunctionExists )
##### check for functions #######################

set( bak_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} )
set( CMAKE_REQUIRED_LIBRARIES ${DL_LIBRARIES} )
@@ -106,11 +110,6 @@ set( CMAKE_REQUIRED_LIBRARIES ${bak_CMAKE_REQUIRED_LIBRARIES} )
unset( bak_CMAKE_REQUIRED_LIBRARIES )


##### check for modules #########################

include( FindPkgConfig )


##### check for audiofile #######################

set( HAVE_LIBAUDIOFILE 0 )
@@ -233,8 +232,6 @@ endif( )

##### check for TQt #############################

include( CheckCXXSourceCompiles )

find_package( TQt )




Loading…
Cancel
Save