-
-
Notifications
You must be signed in to change notification settings - Fork 365
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
rework cmake configs #209
rework cmake configs #209
Conversation
036f028
to
f063558
Compare
Now that the checks are passing I think this PR might be ready to merge. On a side note, I mean no offense with the next part, but you probably know this PR clashes with #147, so what I was wondering is if there's anything that PR has or does that this one doesn't. I'm asking because I'm not that experienced with CMake. |
This PR wasn't even supposed to be done at the moment. |
That wasn't what I meant, You seemed to take a different approach to get FindPackage working, and I was wondering which way was better.. Sorry for the misunderstanding |
I have no FindPackage code in this PR. Mine would have looked almost like his, from what I've seen. |
Hmmm, I understand, thanks for clarifying |
da1c9cf
to
c4d0c2a
Compare
5cc8349
to
47350a0
Compare
|
f5c0df5
to
36fe5a3
Compare
647e3c7
to
3f85655
Compare
9f5abdb
to
7e6ab23
Compare
Coverage here is incorrect, it's being pulled from when some tests were disabled (I believe), the newer tests give a 500 error, I was informed by Coveralls that this is due to some downtime they've been having and should be fixed in time. |
okay for some reason coverage went down to 66%... |
See CrowCpp#160 for more info.
I have a hunch where it might be coming from. diff --git a/.travis.yml b/.travis.yml
index eb59f5b7c8..7c49755b7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,7 @@ addons:
- mkdocs
- graphviz
- zlib1g-dev
+ - libssl-dev
before_install:
- if [ "$TRAVIS_COMPILER" == "gcc" -a "$TRAVIS_CPU_ARCH" == "amd64" ]; then export PUSH_COVERAGE=ON; fi
@@ -45,7 +46,7 @@ before_script:
- mkdir build
- cd build
- cmake --version
- - cmake ..
+ - cmake .. -DCROW_ENABLE_COMPRESSION=ON -DCROW_ENABLE_SSL=ON I've enabled SSL in the CI build, leading to #ifdef CROW_ENABLE_SSL
...
#endif Now though, it is enabled but no tests exist for the now accessible code. |
hmmm, we could undefine CROW_ENABLE_SSL at the unittest, or get #130 working. what do you suggest? |
I think getting some SSL tests up and running is the proper way to up the coverage again. |
I'll merge this into a separate branch, Add documentation and SSL tests, and merge everything into master. Thanks again for all your help. |
This PR partly fixes #160
It restructures the CMake system quite a bit.
It is adding:
It is removing:
#define CROW_ENABLE_SSL
and#define CROW_ENABLE_COMPRESSION
(Except if the amalgam is used)Left to do: