Merge branch 'main' of github.com:rcaelers/workrave

rcaelers · Sep 18, 2024 · e8ccfb8 · e8ccfb8
2 parents dc5bf96 + 541e10a
commit e8ccfb8
Showing 1 changed file with 56 additions and 54 deletions.
diff --git a/libs/hooks/CMakeLists.txt b/libs/hooks/CMakeLists.txt
@@ -2,67 +2,69 @@
 #add_subdirectory(harpoon)
 #add_subdirectory(harpoonHelper)
 
-find_program(MSBUILD_EXECUTABLE
-    NAMES msbuild.exe
-    PATHS
-    "$ENV{ProgramFiles}/Microsoft Visual Studio/2022/Community/MSBuild/Current/Bin"
-    "$ENV{ProgramFiles}/Microsoft Visual Studio/2022/Professional/MSBuild/Current/Bin"
-    "$ENV{ProgramFiles}/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin"
-    "$ENV{ProgramFiles\(x86\)}/Microsoft Visual Studio/2022/Community/MSBuild/Current/Bin"
-    "$ENV{ProgramFiles\(x86\)}/Microsoft Visual Studio/2022/Professional/MSBuild/Current/Bin"
-    "$ENV{ProgramFiles\(x86\)}/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin"
-    NO_DEFAULT_PATH
-)
+if (WIN32)
+  find_program(MSBUILD_EXECUTABLE
+      NAMES msbuild.exe
+      PATHS
+      "$ENV{ProgramFiles}/Microsoft Visual Studio/2022/Community/MSBuild/Current/Bin"
+      "$ENV{ProgramFiles}/Microsoft Visual Studio/2022/Professional/MSBuild/Current/Bin"
+      "$ENV{ProgramFiles}/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin"
+      "$ENV{ProgramFiles\(x86\)}/Microsoft Visual Studio/2022/Community/MSBuild/Current/Bin"
+      "$ENV{ProgramFiles\(x86\)}/Microsoft Visual Studio/2022/Professional/MSBuild/Current/Bin"
+      "$ENV{ProgramFiles\(x86\)}/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin"
+      NO_DEFAULT_PATH
+  )
 
-if (NOT MSBUILD_EXECUTABLE)
-    message(FATAL_ERROR "msbuild.exe not found. Please ensure Visual Studio 2022 is installed.")
-endif()
+  if (NOT MSBUILD_EXECUTABLE)
+      message(FATAL_ERROR "msbuild.exe not found. Please ensure Visual Studio 2022 is installed.")
+  endif()
 
-set(HARPOON_SOLUTION_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-set(HARPOON_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/harpoon/_build")
-set(HARPOON_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/harpoon/_output")
+  set(HARPOON_SOLUTION_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+  set(HARPOON_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/harpoon/_build")
+  set(HARPOON_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/harpoon/_output")
 
-set(configurations Debug Release)
-set(platforms x86 x64 ARM64)
+  set(configurations Debug Release)
+  set(platforms x86 x64 ARM64)
 
-foreach(configuration IN LISTS configurations)
-  foreach(platform IN LISTS platforms)
-    set(proj_name "Harpoon_${configuration}_${platform}")
+  foreach(configuration IN LISTS configurations)
+    foreach(platform IN LISTS platforms)
+      set(proj_name "Harpoon_${configuration}_${platform}")
 
-    if("${platform}" STREQUAL "x86")
-      set(target_name "harpoon")
-    else()
-      set(target_name "harpoon64")
-    endif()
+      if("${platform}" STREQUAL "x86")
+        set(target_name "harpoon")
+      else()
+        set(target_name "harpoon64")
+      endif()
 
-    set(output_dir "${HARPOON_OUTPUT_DIR}/${configuration}/${platform}")
-    set(build_dir "${HARPOON_BUILD_DIR}/${configuration}/${platform}")
+      set(output_dir "${HARPOON_OUTPUT_DIR}/${configuration}/${platform}")
+      set(build_dir "${HARPOON_BUILD_DIR}/${configuration}/${platform}")
 
-    cmake_path(NATIVE_PATH output_dir output_dir_win)
-    cmake_path(NATIVE_PATH build_dir build_dir_win)
-    cmake_path(NATIVE_PATH HARPOON_SOLUTION_DIR HARPOON_SOLUTION_DIR_WIN)
+      cmake_path(NATIVE_PATH output_dir output_dir_win)
+      cmake_path(NATIVE_PATH build_dir build_dir_win)
+      cmake_path(NATIVE_PATH HARPOON_SOLUTION_DIR HARPOON_SOLUTION_DIR_WIN)
 
-    ExternalProject_Add(${proj_name}
-      SOURCE_DIR        "${HARPOON_SOLUTION_DIR}"
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND     "${MSBUILD_EXECUTABLE}" "${HARPOON_SOLUTION_DIR_WIN}\\harpoon.sln"
-                        /p:Configuration=${configuration}
-                        /p:Platform=${platform}
-                        /p:OutDir=${output_dir_win}/
-      INSTALL_COMMAND   ""
-      BUILD_BYPRODUCTS  "${output_dir}/${target_name}.lib" "${output_dir}/${target_name}.dll"
-    )
+      ExternalProject_Add(${proj_name}
+        SOURCE_DIR        "${HARPOON_SOLUTION_DIR}"
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND     "${MSBUILD_EXECUTABLE}" "${HARPOON_SOLUTION_DIR_WIN}\\harpoon.sln"
+                          /p:Configuration=${configuration}
+                          /p:Platform=${platform}
+                          /p:OutDir=${output_dir_win}/
+        INSTALL_COMMAND   ""
+        BUILD_BYPRODUCTS  "${output_dir}/${target_name}.lib" "${output_dir}/${target_name}.dll"
+      )
+    endforeach()
   endforeach()
-endforeach()
 
-## TODO: ARM64 support
-add_library(harpoon64 SHARED IMPORTED GLOBAL)
-set_target_properties(harpoon64 PROPERTIES
-  IMPORTED_LOCATION "${HARPOON_OUTPUT_DIR}/Release/x64/harpoon64.dll"
-  IMPORTED_IMPLIB "${HARPOON_OUTPUT_DIR}/Release/x64/harpoon64.lib"
-  INTERFACE_INCLUDE_DIRECTORIES "${HARPOON_SOLUTION_DIR}/harpoon/include;${HARPOON_SOLUTION_DIR}/harpoonHelper/include"
-  PREFIX ""
-)
-add_dependencies(harpoon64 Harpoon_Release_x64)
-install(FILES "${HARPOON_OUTPUT_DIR}/Release/x86/harpoon.dll" DESTINATION ${BINDIR32})
-install(FILES "${HARPOON_OUTPUT_DIR}/Release/x64/harpoon64.dll" DESTINATION ${BINDIR})
+  ## TODO: ARM64 support
+  add_library(harpoon64 SHARED IMPORTED GLOBAL)
+  set_target_properties(harpoon64 PROPERTIES
+    IMPORTED_LOCATION "${HARPOON_OUTPUT_DIR}/Release/x64/harpoon64.dll"
+    IMPORTED_IMPLIB "${HARPOON_OUTPUT_DIR}/Release/x64/harpoon64.lib"
+    INTERFACE_INCLUDE_DIRECTORIES "${HARPOON_SOLUTION_DIR}/harpoon/include;${HARPOON_SOLUTION_DIR}/harpoonHelper/include"
+    PREFIX ""
+  )
+  add_dependencies(harpoon64 Harpoon_Release_x64)
+  install(FILES "${HARPOON_OUTPUT_DIR}/Release/x86/harpoon.dll" DESTINATION ${BINDIR32})
+  install(FILES "${HARPOON_OUTPUT_DIR}/Release/x64/harpoon64.dll" DESTINATION ${BINDIR})
+endif()