Simplify code since cmake minimum version is now 3.5

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 3fef288384)
pull/271/head
Michele Calgaro 10 months ago
parent 5e51787f9a
commit d81ab9bb5c
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -57,14 +57,8 @@ list( APPEND TDECORE_LIBRARY_DIRS ${TQT_LIBRARY_DIRS} )
##### add apidox targets ############ ##### 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 add_custom_target( apidox
COMMAND ${CMAKE_ENV} COMMAND ${CMAKE_COMMAND} -E env
"TQTDOCDIR=/usr/share/tqt3/doc/html" "TQTDOCDIR=/usr/share/tqt3/doc/html"
${CMAKE_SOURCE_DIR}/admin/doxygen.sh ${CMAKE_SOURCE_DIR}/admin/doxygen.sh
--no-modulename --no-modulename

@ -73,12 +73,6 @@ tde_add_check_executable( testread2
LINK ${TDEABC_TESTS_LINK} LINK ${TDEABC_TESTS_LINK}
) )
if( CMAKE_VERSION VERSION_LESS "2.8.4" )
if( NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/tests" )
execute_process( COMMAND ln -s "${CMAKE_CURRENT_SOURCE_DIR}/tests" "${CMAKE_CURRENT_BINARY_DIR}/tests" )
endif( )
endif()
add_test( NAME tdeabc/vcardparser/testread2 COMMAND testread2 WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" ) add_test( NAME tdeabc/vcardparser/testread2 COMMAND testread2 WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" )
# testread tests # testread tests

Loading…
Cancel
Save