1 files changed, 11 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76f61281..6e27d43a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,21 +9,24 @@
 #
 #################################################
 
-cmake_minimum_required( VERSION 3.5 )
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+tde_set_project_version( )
 
 
 ##### general package setup #####################
 
 project( tdemultimedia )
-
 set( PACKAGE tdemultimedia )
 
-enable_testing( )
-
 
 ##### include essential cmake modules ###########
 
 include( FindPkgConfig )
+include( FindThreads )
 include( CheckIncludeFile )
 include( CheckIncludeFileCXX )
 include( CheckTypeSize )
@@ -32,6 +35,8 @@ include( CheckCXXSourceCompiles )
 include( CheckFunctionExists )
 include( CheckLibraryExists )
 include( CheckSymbolExists )
+enable_language( ASM )
+enable_testing( )
 
 
 ##### include our cmake modules #################
@@ -39,11 +44,6 @@ include( CheckSymbolExists )
 include( TDEMacros )
 
 
-##### set version number ########################
-
-tde_set_project_version( )
-
-
 ##### setup install paths #######################
 
 include( TDESetupPaths )
@@ -52,7 +52,7 @@ tde_setup_paths( )
 
 ##### optional stuff ############################
 
-OPTION( WITH_ALL_OPTIONS "Enable all optional support" OFF )
+option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
 option( WITH_ALSA "Enable ALSA support (kscd, kmix)" ON )
 option( WITH_ARTS_AKODE "Enable aRts akode plugin" ${WITH_ALL_OPTIONS} )
 option( WITH_ARTS_AUDIOFILE "Enable aRts audiofile plugin" ${WITH_ALL_OPTIONS} )
@@ -167,14 +167,8 @@ configure_file( config.h.cmake config.h @ONLY )
 
 ##### add apidox targets ############
 
-if( "${CMAKE_VERSION}" VERSION_LESS "3.1" )
-  set( CMAKE_ENV "env" )
-else()
-  set( CMAKE_ENV "${CMAKE_COMMAND};-E;env" )
-endif()
-
 add_custom_target( apidox
-  COMMAND ${CMAKE_ENV}
+  COMMAND ${CMAKE_COMMAND} -E env
     "TQTDOCDIR=/usr/share/tqt3/doc/html"
     "DOXDATA=${HTML_INSTALL_DIR}/en/common"
     ${CMAKE_SOURCE_DIR}/admin/doxygen.sh