diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2014-09-15 21:46:19 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-09-15 21:46:19 +0200 |
| commit | e39b3d2d65688df0e8fa4a16945158d2da85522e (patch) | |
| tree | 66267d975a39f061adb6fb0d16f310a04b715d09 | |
| parent | d6fd5da548d89f18642849f72295f6fbed440dfc (diff) | |
| download | arts-e39b3d2d.tar.gz arts-e39b3d2d.zip | |
Fix FTBFS due to late includes in CMake
| -rw-r--r-- | CMakeLists.txt | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 47215ec..4c73f48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 ) |