improved info window

teamspatzenhirn · Aug 20, 2023 · 4b9bae8 · 4b9bae8
1 parent 82e8bfe
commit 4b9bae8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -51,7 +51,7 @@ install(TARGETS ${PROJECT_NAME}
         DESTINATION lib/${PROJECT_NAME}
 )
 
-install(FILES resource/rig_reconfigure.png
+install(FILES resource/rig_reconfigure.png resource/rig_reconfigure_text.png
         DESTINATION share/${PROJECT_NAME}/resource
 )
 

diff --git a/cmake/CheckGit.cmake b/cmake/CheckGit.cmake
@@ -1,6 +1,10 @@
 # adapted from https://gitlab.com/jhamberg/cmake-examples/-/blob/master/cmake/CheckGit.cmake
 
 set(CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR})
+if (NOT DEFINED pre_configure_inc_dir)
+    set(pre_configure_inc_dir ${CMAKE_SOURCE_DIR}/include)
+endif ()
+
 if (NOT DEFINED pre_configure_dir)
     set(pre_configure_dir ${CMAKE_SOURCE_DIR}/src)
 endif ()
@@ -40,7 +44,7 @@ function(CheckGitVersion)
     endif ()
 
     if (NOT EXISTS ${post_configure_dir}/git_version.hpp)
-        file(COPY ${pre_configure_dir}/git_version.hpp DESTINATION ${post_configure_dir})
+        file(COPY ${pre_configure_inc_dir}/git_version.hpp DESTINATION ${post_configure_dir})
     endif()
 
     if (NOT DEFINED GIT_HASH_CACHE)
@@ -63,6 +67,7 @@ function(CheckGitSetup)
 
     add_custom_target(AlwaysCheckGit COMMAND ${CMAKE_COMMAND}
             -DRUN_CHECK_GIT_VERSION=1
+            -Dpre_configure_inc_dir=${pre_configure_inc_dir}
             -Dpre_configure_dir=${pre_configure_dir}
             -Dpost_configure_file=${post_configure_dir}
             -DGIT_HASH_CACHE=${GIT_HASH_CACHE}

diff --git a/resource/rig_reconfigure_text.png b/resource/rig_reconfigure_text.png