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

CMake improvements #57

Merged
merged 1 commit into from Sep 9, 2017
Merged

Conversation

rcdailey
Copy link
Contributor

@rcdailey rcdailey commented Sep 8, 2017

  • Installation working as a configuration package
  • Fix source listing to not use GLOB per CMake recommendation. Files
    are listed explicitly in source_files.cmake so that if file listing
    changes, CMake can detect it and regenerate as needed.
  • Added debug postfix for libs for side-by-side installation of different
    build variants (libzxing.lib and libzxing-debug.lib on Windows)

Notes:

  • Proper versioning is not being done in the installation config package. If a version is known, it should be added.
  • I had to comment out the windows-specific stuff (core/win32) because it caused compiler issues in Windows SDK headers.

* Installation working as a configuration package
* Fix source listing to not use GLOB per CMake recommendation. Files
  are listed explicitly in `source_files.cmake` so that if file listing
  changes, CMake can detect it and regenerate as needed.
* Added debug postfix for libs for side-by-side installation of different
  build variants (`libzxing.lib` and `libzxing-debug.lib` on Windows)
@aidansteele aidansteele merged commit 07e5600 into glassechidna:master Sep 9, 2017
@aidansteele
Copy link
Contributor

Thanks, this is great!

@rcdailey rcdailey deleted the cmake-install branch September 11, 2017 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants