Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

restore bareos icons on windows #1784

Open
arogge opened this issue Apr 18, 2024 · 0 comments · May be fixed by #1744
Open

restore bareos icons on windows #1784

arogge opened this issue Apr 18, 2024 · 0 comments · May be fixed by #1744
Assignees
Labels
bug This addresses a bug
Milestone

Comments

@arogge
Copy link
Member

arogge commented Apr 18, 2024

Problem seems to be the STATIC objects we use. If you link the resource directly to the executable

modified   core/src/filed/CMakeLists.txt
@@ -60,11 +60,6 @@ if(HAVE_WIN32)
   )
 endif()
 
-if(HAVE_WIN32)
-  bareos_configure_file(FILES ../win32/filed/filedres.rc.in)
-  list(APPEND FDSRCS ${CMAKE_CURRENT_BINARY_DIR}/../win32/filed/filedres.rc)
-endif()
-
 include_directories(${OPENSSL_INCLUDE_DIR})
 
 add_library(fd_objects STATIC ${FDSRCS})
@@ -76,6 +71,11 @@ endif()
 
 add_executable(bareos-fd filed.cc)
 
+if(HAVE_WIN32)
+  bareos_configure_file(FILES ../win32/filed/filedres.rc.in)
+  target_sources(bareos-fd PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../win32/filed/filedres.rc)
+endif()
+
 set(BAREOS_FD_LIBRARIES bareosfind bareos Threads::Threads)
 if(HAVE_WIN32)
   target_sources(bareos-fd PRIVATE ../win32/generic/main.cc)

then the icon appears normally again.

@arogge arogge linked a pull request Apr 18, 2024 that will close this issue
15 tasks
@arogge arogge added this to the 24.0.0 milestone Apr 18, 2024
@arogge arogge added the bug This addresses a bug label Apr 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This addresses a bug
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants