diff options
| author | Michele Calgaro <[email protected]> | 2024-02-14 16:37:29 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2024-02-15 11:03:55 +0900 |
| commit | d81ab9bb5c7fa43eadc3f6cee929602c162b8107 (patch) | |
| tree | 8eab132a999ad1a734a765043c8781438785652e | |
| parent | 5e51787f9af4fd86450fab9e787b4037a772bca3 (diff) | |
| download | tdelibs-d81ab9bb5c7fa43eadc3f6cee929602c162b8107.tar.gz tdelibs-d81ab9bb5c7fa43eadc3f6cee929602c162b8107.zip | |
Simplify code since cmake minimum version is now 3.5
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 3fef2883847ae38f1b55e9a1d09f1a908a81f4b1)
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tdeabc/vcardparser/CMakeLists.txt | 6 |
2 files changed, 1 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e3fd6f294..ed2b99b96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,14 +57,8 @@ list( APPEND TDECORE_LIBRARY_DIRS ${TQT_LIBRARY_DIRS} ) ##### 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" ${CMAKE_SOURCE_DIR}/admin/doxygen.sh --no-modulename diff --git a/tdeabc/vcardparser/CMakeLists.txt b/tdeabc/vcardparser/CMakeLists.txt index 692b7829f..e141d1f47 100644 --- a/tdeabc/vcardparser/CMakeLists.txt +++ b/tdeabc/vcardparser/CMakeLists.txt @@ -73,12 +73,6 @@ tde_add_check_executable( testread2 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}" ) # testread tests |