Modern CMake configuration refactoring #130
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
|
The latest CI builds of this PR are failing due to AppVeyor - https://ci.appveyor.com/project/dbaston/geos-rxhmj/builds/19662254
Travis CI - https://travis-ci.com/libgeos/geos/builds/88630941 |
Contributor
Author
|
FYI, updated lowering CMake requirement to 3.11, but it may be possible to lower it further eg. to 3.5. I just have no mean to test it against 3.5. |
Member
|
I tried lowering to 3.10 and got:
CMake Error at tests/xmltester/CMakeLists.txt:15 (add_executable):
add_executable called with incorrect number of arguments
This is with version 3.10.2 which is what Ubuntu 18.04.1 LTS
ships (supported distribution till April 2020).
|
Contributor
Author
|
Thanks for testing. I've applied workaround to |
Member
|
CMake 3.10.2 worked, and subsequent `make` invocation took:
real 3m36.079s
user 3m17.767s
sys 0m18.087s
Subsequent failed tests:
make: *** No rule to make target 'check'. Stop.
make: *** No rule to make target 'dist'. Stop.
make: *** No rule to make target 'distcheck'. Stop.
make: *** No rule to make target 'uninstall'. Stop.
The `install` rule worked, but I only see two library files
installed in /usr/local/lib/ with the current time:
-rw-r--r-- 1 root root 21007490 Oct 29 12:30 /usr/local/lib//libgeos.a
-rw-r--r-- 1 root root 756596 Oct 29 12:30 /usr/local/lib//libgeos_c.a
No .so files (maybe because they were found already present ?)
|
Contributor
Author
"With CPack enabled, "make help" will show all the valid targets" That, however, someone will have to work about.
By default, static libs are generated. Use CMake native BUILD_SHARED_LIBS to ask for shared. |
dbaston
reviewed
Oct 31, 2018
Minimal build and install features implemented according to Modern CMake best practices for all GEOS targets, libraries and tests. Require CMake 3.5 or later. Add cmake/CMakeSettings.json sample with convenient defaults for users of CMake integration in Visual Studio 2017 (usage: copy to root folder). Add cmake/geos-configure-file.cmake from Dan Baston (@dbaston).
Contributor
Author
|
@dbaston FYI, I've fixed the PR to make it single-commit again, as I prefer it. Future of this PRSince you have expressed interest to expand it, I think it may be a a good idea to consider either
Either way, I expect it to be easier for you to continue the work since I strongly prefer single-commit pull requests, so my workflow involves |
Member
|
@mloskot I will continue work in a new branch: https://github.com/dbaston/libgeos/commits/modern-cmake |
Contributor
Author
|
@dbaston Great. Shall we close this PR? |
Member
|
I'm going to close this PR and hope Dan's branch is active. |
Contributor
Author
|
Good idea. @dbaston Can I delete my |
This was referenced Feb 13, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Minimal build and install features implemented according to Modern CMake best practices for all GEOS targets, libraries and tests.
Require CMake 3.5 or later.
Add
cmake/CMakeSettings.jsonsample with convenient defaults for users of CMake integration in Visual Studio 2017 (usage: copy to root folder).Add cmake/geos-configure-file.cmake from Dan Baston (@dbaston).
I tested it with CMake 3.11+ on Linux (GCC, clang) and Windows (Visual Studio).
@robe2, @pramsey, @dbaston - following our discussions on IRC, here I pushed complete update of my ml/modern-cmake branch, rebased on the latest
master@ c818506Tasklist
Iteration of CMake script clean-ups adding missing
unset, removing any unnecessary bits and bobs (eg. variables), etc.Add GEOS client example configured with CMake as a test to verify
geos-config.cmakepackage configuration file deployment.Update README.md with building, testing, installation and using GEOS with CMake
Update
.travis.ymlwith complete workflow: configure, build, test, install, configure and build client. Install latest CMake. Remove Autotools jobs.Update
.appveyor.ymlwith workflow: configure, build, test. Install latest CMake. Remove NMake jobs.Update
.appveyor.ymlwith rest of workflow: install, configure and build client.Tag version with git hash, tag or
-dirtyindicator for modified working copy (see CMakeVersionSource.cmake and related scripts) in CMake's codebase)Review compilation flags for supported compilers for both consumers, client and developer
Replace ugly old-school
if-s setting flags per compiler with generator expressions passed totarget_compile_optionsandtarget_compile_definitions, for example:$<$<CXX_COMPILER_ID:GNU>:-Wall;-Wextra;-Wpedantic> $<$<CXX_COMPILER_ID:MSVC>:NOMINMAX>Add support for OSX Framework
Deal with
tools/CMakeLists.txtor remove alogn withgeos-configscriptAdd CPack integration
Add target for Doxygen build
...
Since I'm not sure if/when I'd be able to complete those TODOs, I'll hand the work over to you now.