Rename YarpOSXUtilities -> YarpMacOSUtilities

isorrentino · Aug 16, 2019 · defbe32 · defbe32
1 parent ccdd246
commit defbe32
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 44 deletions.
diff --git a/cmake/YarpOSXUtilities.cmake → cmake/YarpMacOSUtilities.cmake b/cmake/YarpOSXUtilities.cmake → cmake/YarpMacOSUtilities.cmake
@@ -12,13 +12,16 @@ if(POLICY CMP0054)
 endif()
 
 if(APPLE)
-  option(YARP_DISABLE_OSX_BUNDLES "Disable macOS bundles" OFF)
-  mark_as_advanced(YARP_DISABLE_OSX_BUNDLES)
+  option(YARP_DISABLE_MACOS_BUNDLES "Disable macOS bundles" OFF)
+  mark_as_advanced(YARP_DISABLE_MACOS_BUNDLES)
+
+  include(YarpRenamedOption)
+  yarp_renamed_option(YARP_DISABLE_OSX_BUNDLES YARP_DISABLE_MACOS_BUNDLES)
 endif()
 
-function(YARP_OSX_DUPLICATE_AND_ADD_BUNDLE)
+function(YARP_MACOS_DUPLICATE_AND_ADD_BUNDLE)
 
-  if(APPLE AND NOT YARP_DISABLE_OSX_BUNDLES)
+  if(APPLE AND NOT YARP_DISABLE_MACOS_BUNDLES)
     set(_options )
     set(_oneValueArgs TARGET
                       APP_ICON

diff --git a/src/yarpbatterygui/CMakeLists.txt b/src/yarpbatterygui/CMakeLists.txt
@@ -7,7 +7,7 @@
 if(YARP_COMPILE_yarpbatterygui)
 
   include(YarpUseQt5)
-  include(YarpOSXUtilities)
+  include(YarpMacOSUtilities)
 
   set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 
@@ -52,8 +52,8 @@ if(YARP_COMPILE_yarpbatterygui)
 
   set_property(TARGET yarpbatterygui PROPERTY FOLDER "Graphical User Interfaces")
 
-  yarp_osx_duplicate_and_add_bundle(TARGET yarpbatterygui
-                                    INSTALL_COMPONENT utilities
-                                    INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
+  yarp_macos_duplicate_and_add_bundle(TARGET yarpbatterygui
+                                      INSTALL_COMPONENT utilities
+                                      INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
 
 endif()
diff --git a/src/yarpdataplayer/CMakeLists.txt b/src/yarpdataplayer/CMakeLists.txt
@@ -7,7 +7,7 @@
 if(YARP_COMPILE_yarpdataplayer)
 
   include(YarpUseQt5)
-  include(YarpOSXUtilities)
+  include(YarpMacOSUtilities)
 
   set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 
@@ -101,8 +101,8 @@ if(YARP_COMPILE_yarpdataplayer)
 
   set_property(TARGET yarpdataplayer PROPERTY FOLDER "Graphical User Interfaces")
 
-  yarp_osx_duplicate_and_add_bundle(TARGET yarpdataplayer
-                                    INSTALL_COMPONENT utilities
-                                    INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
+  yarp_macos_duplicate_and_add_bundle(TARGET yarpdataplayer
+                                      INSTALL_COMPONENT utilities
+                                      INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
 
 endif()
diff --git a/src/yarplaserscannergui/CMakeLists.txt b/src/yarplaserscannergui/CMakeLists.txt
@@ -7,7 +7,7 @@
 if(YARP_COMPILE_yarplaserscannergui)
 
   include(YarpUseQt5)
-  include(YarpOSXUtilities)
+  include(YarpMacOSUtilities)
 
   include_directories(${OpenCV_INCLUDE_DIRS})
 
@@ -54,8 +54,8 @@ if(YARP_COMPILE_yarplaserscannergui)
 
   set_property(TARGET yarplaserscannergui PROPERTY FOLDER "Graphical User Interfaces")
 
-  yarp_osx_duplicate_and_add_bundle(TARGET yarplaserscannergui
-                                    INSTALL_COMPONENT utilities
-                                    INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
+  yarp_macos_duplicate_and_add_bundle(TARGET yarplaserscannergui
+                                      INSTALL_COMPONENT utilities
+                                      INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
 
 endif()
diff --git a/src/yarplogger/CMakeLists.txt b/src/yarplogger/CMakeLists.txt
@@ -9,7 +9,7 @@ if(YARP_COMPILE_yarplogger)
   project(yarplogger)
 
   include(YarpUseQt5)
-  include(YarpOSXUtilities)
+  include(YarpMacOSUtilities)
 
   set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 
@@ -51,8 +51,8 @@ if(YARP_COMPILE_yarplogger)
 
   set_property(TARGET yarplogger PROPERTY FOLDER "Graphical User Interfaces")
 
-  yarp_osx_duplicate_and_add_bundle(TARGET yarplogger
-                                    INSTALL_COMPONENT utilities
-                                    INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
+  yarp_macos_duplicate_and_add_bundle(TARGET yarplogger
+                                      INSTALL_COMPONENT utilities
+                                      INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
 
 endif()
diff --git a/src/yarpmanager/CMakeLists.txt b/src/yarpmanager/CMakeLists.txt
@@ -7,7 +7,7 @@
 if(YARP_COMPILE_yarpmanager)
 
   include(YarpUseQt5)
-  include(YarpOSXUtilities)
+  include(YarpMacOSUtilities)
 
   include_directories("${CMAKE_CURRENT_LIST_DIR}/src-builder"
                       "${CMAKE_CURRENT_LIST_DIR}/src-manager")
@@ -147,9 +147,9 @@ if(YARP_COMPILE_yarpmanager)
 
   set_property(TARGET yarpmanager PROPERTY FOLDER "Graphical User Interfaces")
 
-  yarp_osx_duplicate_and_add_bundle(TARGET yarpmanager
-                                    APP_ICON Resources/AppIcon.icns
-                                    INSTALL_COMPONENT utilities
-                                    INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
+  yarp_macos_duplicate_and_add_bundle(TARGET yarpmanager
+                                      APP_ICON Resources/AppIcon.icns
+                                      INSTALL_COMPONENT utilities
+                                      INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
 
 endif()
diff --git a/src/yarpmotorgui/CMakeLists.txt b/src/yarpmotorgui/CMakeLists.txt
@@ -7,7 +7,7 @@
 if(YARP_COMPILE_yarpmotorgui)
 
   include(YarpUseQt5)
-  include(YarpOSXUtilities)
+  include(YarpMacOSUtilities)
 
   set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 
@@ -72,9 +72,9 @@ if(YARP_COMPILE_yarpmotorgui)
 
   set_property(TARGET yarpmotorgui PROPERTY FOLDER "Graphical User Interfaces")
 
-  yarp_osx_duplicate_and_add_bundle(TARGET yarpmotorgui
-                                    INSTALL_COMPONENT utilities
-                                    INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
+  yarp_macos_duplicate_and_add_bundle(TARGET yarpmotorgui
+                                      INSTALL_COMPONENT utilities
+                                      INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
 
   yarp_install(FILES yarpmotorgui.xml
                DESTINATION ${YARP_MODULES_INSTALL_DIR})

diff --git a/src/yarpscope/src/CMakeLists.txt b/src/yarpscope/src/CMakeLists.txt
@@ -4,7 +4,7 @@
 # This software may be modified and distributed under the terms of the
 # BSD-3-Clause license. See the accompanying LICENSE file for details.
 
-include(YarpOSXUtilities)
+include(YarpMacOSUtilities)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/qtquick2applicationviewer)
 
@@ -44,11 +44,11 @@ install(TARGETS yarpscope
 
 set_property(TARGET yarpscope PROPERTY FOLDER "Graphical User Interfaces")
 
-yarp_osx_duplicate_and_add_bundle(TARGET yarpscope
-                                  INSTALL_COMPONENT utilities
-                                  INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
+yarp_macos_duplicate_and_add_bundle(TARGET yarpscope
+                                    INSTALL_COMPONENT utilities
+                                    INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
 
-if(APPLE  AND NOT YARP_DISABLE_OSX_BUNDLES)
+if(APPLE AND NOT YARP_DISABLE_MACOS_BUNDLES)
   add_dependencies(yarpscope.app QtYARPScopePlugin)
   add_custom_command(TARGET yarpscope.app POST_BUILD
                      COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:QtYARPScopePlugin>"

diff --git a/src/yarpview/src/CMakeLists.txt b/src/yarpview/src/CMakeLists.txt
@@ -4,7 +4,7 @@
 # This software may be modified and distributed under the terms of the
 # BSD-3-Clause license. See the accompanying LICENSE file for details.
 
-include(YarpOSXUtilities)
+include(YarpMacOSUtilities)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/qtquick2applicationviewer)
 
@@ -44,12 +44,12 @@ install(TARGETS yarpview
 
 set_property(TARGET yarpview PROPERTY FOLDER "Graphical User Interfaces")
 
-yarp_osx_duplicate_and_add_bundle(TARGET yarpview
-                                  APP_ICON icons/AppIcon.icns
-                                  INSTALL_COMPONENT utilities
-                                  INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
+yarp_macos_duplicate_and_add_bundle(TARGET yarpview
+                                    APP_ICON icons/AppIcon.icns
+                                    INSTALL_COMPONENT utilities
+                                    INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
 
-if(APPLE AND NOT YARP_DISABLE_OSX_BUNDLES)
+if(APPLE AND NOT YARP_DISABLE_MACOS_BUNDLES)
   add_dependencies(yarpview.app QtYARPViewPlugin)
   add_custom_command(TARGET yarpview.app POST_BUILD
                      COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:QtYARPViewPlugin>"

diff --git a/src/yarpviz/CMakeLists.txt b/src/yarpviz/CMakeLists.txt
@@ -9,7 +9,7 @@ if(YARP_COMPILE_yarpviz)
   project(yarpviz)
 
   include(YarpUseQt5)
-  include(YarpOSXUtilities)
+  include(YarpMacOSUtilities)
 
   add_subdirectory(src)
   add_subdirectory(app)

diff --git a/src/yarpviz/src/CMakeLists.txt b/src/yarpviz/src/CMakeLists.txt
@@ -66,6 +66,6 @@ install(TARGETS yarpviz
 
 set_property(TARGET yarpviz PROPERTY FOLDER "Graphical User Interfaces")
 
-yarp_osx_duplicate_and_add_bundle(TARGET yarpviz
-                                  INSTALL_COMPONENT utilities
-                                  INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
+yarp_macos_duplicate_and_add_bundle(TARGET yarpviz
+                                    INSTALL_COMPONENT utilities
+                                    INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")