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

Replaced hardcoded installdirs with GNUInstallDirs. Fixed some status msgs #323

Merged
merged 1 commit into from
Apr 5, 2018

Conversation

ethouris
Copy link
Collaborator

No description provided.

@ethouris
Copy link
Collaborator Author

As per #313

if (CYGWIN)
set (INSTALL_SHARED_DIR bin)
set (INSTALL_SHARED_DIR ${CMAKE_INSTALL_BINDIR})
Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't this not set if you dont use GNUInstalldirs?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

But I do use GNUInstallDirs, unless CMAKE_INSTALL_LIBDIR is set. I state all others are set then as well.

# inside "bin" and "lib64" directories. At least this maintains
# the current status. Shall this be not desired, override values
# of CMAKE_INSTALL_BINDIR, CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR.
if (NOT DEFINED CMAKE_INSTALL_LIBDIR)
Copy link
Contributor

Choose a reason for hiding this comment

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

You may want to just disable it on Windows and enable everywhere else? You want to also replace include/ etc

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I was thinking about it, but actually I have never seen any "installing standards" on Windows, especially as it comes to libraries, and GNUInstallDirs works on Windows as well. AFAIK cmake on Windows allows it to install in C:\Program Files or kinda like that, followed by the project name and then inside this directory the GNU directory layout is as good as any other. I've moved these platform dependent variables just for that purpose, but then I finally came to the conclusion as described in the above comment.

@rndi rndi merged commit 22d8d32 into Haivision:dev Apr 5, 2018
Gummilion added a commit to Gummilion/srt that referenced this pull request May 10, 2018
* dev: (21 commits)
  Fix SRT file transmit app to work in non-blocking mode (Haivision#334)
  Ensure stdout silence in console pipe out mode plus a few minor fixups (Haivision#275)
  Replaced hardcoded installdirs with GNUInstallDirs. Fixed some status messages. (Haivision#323)
  Breaking connection when recv buffer inflation caused sequence discrepancy (Haivision#300)
  Fixed problems with encryption decision and status report on encryption failure. (Haivision#318)
  Fixed invalid symbol names in doc (Haivision#311)
  Dev add version to winpackages (Haivision#328)
  Android build for dev (Haivision#326)
  Change License to MPLv2.0 (Haivision#327)
  Used constants for input rate. Fixed after-start rate sampling period to 1s (Haivision#315)
  Made SockaddrToString use only numeric string by default (Haivision#312)
  Ported change in Haivision#307 PR to dev
  Fixed SockaddrToString to format as 4dotIP if unknown (Haivision#299)
  Build with debug information for lldb on iOS platform (Haivision#302)
  Fix for sudden stop sending data on macOS/iOS (Haivision#303)
  Fix broken build when testing apps enabled (Haivision#296)
  Removed all code introduced for CBR (Haivision#293)
  Added API to get instantaneous stats instead of moving averages for a… (Haivision#288)
  Added toolchain file and build instruction for iOS (Haivision#286)
  Fix windows build (Haivision#290)
  ...
@ethouris ethouris deleted the dev-fix-gnu-installdirs branch May 28, 2018 08:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants