commit ea55792f3ea622f5234fcc55ff0a3d650d6829f3
Author: Kornel Benko <[email protected]>
Date: Thu Feb 6 11:44:52 2025 +0100
Cmake build: Wrong LYX_DATA_SUBDIR set for APPLE
Spotted by Patrick De Visschere
---
CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e32d91b8a7..8cafc14114 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -503,7 +503,6 @@ if(LYX_BUNDLE)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/development/MacOSX/Info.plist.in"
"${CMAKE_CURRENT_BINARY_DIR}/Info.plist")
set(LYX_BUILD_BUNDLE MACOSX_BUNDLE)
- set(LYX_DATA_SUBDIR ${LYX_BUNDLE_NAME}.app/Contents/Resources/
CACHE STRING "Bundle Contents dir" FORCE)
# Variables used by CPack
set(CPACK_BUNDLE_NAME ${LYX_BUNDLE_NAME})
@@ -586,6 +585,8 @@ endif()
if (WIN32)
set(LYX_DATA_SUBDIR "Resources/" CACHE STRING "Subdirectory for all
lyx-system-data" FORCE)
+elsif(APPLE)
+ set(LYX_DATA_SUBDIR ${LYX_BUNDLE_NAME}.app/Contents/Resources/ CACHE
STRING "Bundle Contents dir" FORCE)
else()
set(LYX_DATA_SUBDIR "share/${_lyx}/" CACHE STRING "Subdirectory for all
lyx-system-data" FORCE)
endif()
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
