Skip to content

Fix filepicker on macOS #52

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.

Sign up for GitHub

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

Merged
mauer merged 1 commit into from
Mar 25, 2026
Merged

Fix filepicker on macOS #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 29 additions & 14 deletions cmake/Info.plist.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleIdentifier</key>
<string>@BUNDLE_ID@</string>
<key>CFBundleShortVersionString</key>
<string>@WED_VERSION_STRING@</string>
<key>CFBundleVersion</key>
<string>@WED_VERSION_NUMERIC@</string>
<key>NSHumanReadableCopyright</key>
<string>@WED_COPYRIGHT_STRING@</string>
<key>CFBundleIconFile</key>
<string>WED.icns</string>
</dict>
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>WED</string>
<key>CFBundleGetInfoString</key>
<string>WED @WED_VERSION_STRING@ Copyright 2016, Laminar Research</string>
<key>CFBundleIconFile</key>
<string>WED.icns</string>
<key>CFBundleIdentifier</key>
<string>org.LaminarResearch.WED</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>WED</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>@WED_VERSION_STRING@</string>
<key>CFBundleVersion</key>
<string>@WED_VERSION_NUMERIC@</string>
<key>LSHasLocalizedDisplayName</key>
<false/>
<key>NSHumanReadableCopyright</key>
<string>@WED_COPYRIGHT_STRING@</string>
<key>LSMinimumSystemVersion</key>
<string>10.13</string>
</dict>
</plist>
9 changes: 9 additions & 0 deletions cmake/WED.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,6 +793,15 @@ elseif (APPLE)

mac_copy_bundle_files(WED Resources "${WED_RESOURCE_FILES}")

# Extract version info from WED_Version.h
file(READ "${CMAKE_SOURCE_DIR}/src/WEDCore/WED_Version.h" WED_VERSION_HEADER)
string(REGEX MATCH "#define[ \t]+WED_VERSION_STRING[ \t]+\"([^\"]+)\"" _ ${WED_VERSION_HEADER})
set(WED_VERSION_STRING ${CMAKE_MATCH_1})
string(REGEX MATCH "#define[ \t]+WED_COPYRIGHT_STRING[ \t]+\"([^\"]+)\"" _ ${WED_VERSION_HEADER})
set(WED_COPYRIGHT_STRING ${CMAKE_MATCH_1})
string(REGEX MATCH "#define[ \t]+WED_VERSION_NUMERIC[ \t]+([0-9]+)" _ ${WED_VERSION_HEADER})
set(WED_VERSION_NUMERIC ${CMAKE_MATCH_1})

# configure_file(
# ${CMAKE_SOURCE_DIR}/cmake/Info.plist.in
# ${CMAKE_BINARY_DIR}/Info.plist
Expand Down
2 changes: 2 additions & 0 deletions src/Obj/XDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,8 @@
// This is to put an case-insensitive fopen in place, see in FileUtils.cpp
#ifdef __cplusplus
extern "C" FILE* x_fopen(const char * _Filename, const char * _Mode);
// Inject x_fopen into std namespace for C++ standard library compatibility
namespace std { using ::x_fopen; }
#else
extern FILE* x_fopen(const char * _Filename, const char * _Mode);
#endif
Expand Down
Loading