]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Fix build with cmake >= 3.28
authorAlbert Astals Cid <aacid@kde.org>
Wed, 27 Dec 2023 10:46:22 +0000 (11:46 +0100)
committerAlbert Astals Cid <aacid@kde.org>
Wed, 27 Dec 2023 10:56:54 +0000 (11:56 +0100)
Proposed by krop on #kde-devel

Unless my bisect skills failed broken by https://gitlab.kitware.com/cmake/cmake/-/commit/ebc9e448b38378cc21a6b77df03a77d9732c24ac

cmake/FindGem.cmake
src/tests/CMakeLists.txt

index 612268decb0988c86bff962bab0ce5a7d2d0f0b1..5de3c51abce642c70ba819abab93768abb8cfa02 100644 (file)
@@ -9,7 +9,7 @@
 set(FINDGEM_MODULES_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 function(find_gem GEM_NAME)
 set(FINDGEM_MODULES_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 function(find_gem GEM_NAME)
-    set(GEM_PACKAGE "Gem:${GEM_NAME}")
+    set(GEM_PACKAGE "Gem_${GEM_NAME}")
 
     configure_file(${FINDGEM_MODULES_DIR}/FindGem.cmake.in Find${GEM_PACKAGE}.cmake @ONLY)
 
 
     configure_file(${FINDGEM_MODULES_DIR}/FindGem.cmake.in Find${GEM_PACKAGE}.cmake @ONLY)
 
index 949fd52b3fb0f1da83709d2e0abe3355579b31f8..20b682fe0d80cf88255bfb91b4aa79f71c6acf55 100644 (file)
@@ -70,10 +70,10 @@ LINK_LIBRARIES dolphinprivate dolphinstatic Qt6::Test)
 ecm_add_test(draganddrophelpertest.cpp LINK_LIBRARIES dolphinprivate Qt6::Test)
 
 find_gem(test-unit)
 ecm_add_test(draganddrophelpertest.cpp LINK_LIBRARIES dolphinprivate Qt6::Test)
 
 find_gem(test-unit)
-set_package_properties(Gem:test-unit PROPERTIES
+set_package_properties(Gem_test-unit PROPERTIES
     TYPE RECOMMENDED
     DESCRIPTION "Ruby gem 'test-unit' required for testing of servicemenu helpers.")
     TYPE RECOMMENDED
     DESCRIPTION "Ruby gem 'test-unit' required for testing of servicemenu helpers.")
-if (Gem:test-unit_FOUND)
+if (Gem_test-unit_FOUND)
     add_test(NAME servicemenutest
     COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../settings/contextmenu/test/test_run.rb)
 endif()
     add_test(NAME servicemenutest
     COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../settings/contextmenu/test/test_run.rb)
 endif()