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.

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

Jump to bottom

Drop find_programs gs #728

Merged
merged 2 commits into from
May 17, 2019
Merged

Drop find_programs gs #728

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9172867
Find gswin32 too
seisman May 8, 2019
b213585
No need to find gs in building
seisman May 17, 2019
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
Next Next commit
Find gswin32 too
  • Loading branch information
@seisman
seisman committed May 17, 2019
commit 91728673b7375f90da41485f07458f9f7200be8a
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/"
# Find UNIX commands
include (FindUnixCommands)
find_package (Git)
find_program (GS gs gswin64)
find_program (GS NAMES gs gswin64 gswin32)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I think what is used on Windows are the gswin64c/gswin32c but I don't know why do we search for the ghost on Windows. The only module that uses it is psconvert, and it finds the executable via a registry inquire, which was a complicated thing to achieve because Windows64 have two registries one for 32 and another 64 and the Ghost will be in either one or the other depending on its bitage.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right. Seems we even don't need to search gs on Linux. The variable GS is never used in the cmake configuration or the psconvert source code. Maybe we can remove the find_program (GS ...) line?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, it looks we can drop it.

find_program (XZ NAMES xz)

# Include configuration options (default options and options overridden by user).
Expand Down