-
Notifications
You must be signed in to change notification settings - Fork 78
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 build improvements #441
Open
stefankiesz
wants to merge
96
commits into
develop-pre-1.5.3
Choose a base branch
from
cmake-cleanup
base: develop-pre-1.5.3
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 70 commits
Commits
Show all changes
96 commits
Select commit
Hold shift + click to select a range
2a52d46
InitCommit - Update CMakeLists.txt
stefankiesz f3e3af1
Don't include LWS KVS source files
stefankiesz b837e0f
Remove redundant line from libcurl-CMakeLists.txt
stefankiesz 998ea4e
Cleanup? libwebsockets-CMakeLists.txt
stefankiesz cdad372
Working!
stefankiesz 62b31af
Add comments, remove duplicated lines
stefankiesz 2cd7c83
Link top level opensoure libs directory
stefankiesz 394a4a6
Switch more dirs from current to top level
stefankiesz 9c6de41
Remove one of the lib links
stefankiesz 175ead2
Link curl, ssl, and crypto as private
stefankiesz dbba69f
Some extra reference files to be deleted later
stefankiesz 2ebb24d
Remove curl test code from test main
stefankiesz 0afd3da
Setup choosing between mbedtls and openssl libs
stefankiesz 73dde64
curl->libcurl for windows
stefankiesz c7d43b0
Add comments
stefankiesz bb766aa
Trying to fix Windows curl
stefankiesz 65c7c00
Merge branch 'develop' into cmake-cleanup
stefankiesz c797aa4
Update CMakeLists.txt
stefankiesz 55a4d1b
Update CMakeLists.txt
stefankiesz 9127680
Testing Windows fixes
stefankiesz f032a13
more
stefankiesz 3e519b7
producer c release candidate (#435)
hassanctech fe16da2
Undo Windows fix that wasn't it
stefankiesz e6fa97d
Bring in LWS building, not tested
stefankiesz 8881061
Allow for turning off of sample builds
stefankiesz 2fb90e0
Build local curl for windows
stefankiesz 275c578
Change openssl libs names
stefankiesz c3be70d
Same for curl
stefankiesz ff9f4ec
Remove unused variables
stefankiesz 27a2610
Print CMAKE_BUILD_TYPE
stefankiesz 3a71f9f
Add open-source/bin to link_directories
stefankiesz 54d116d
Set whole build to static for Windows
stefankiesz 0e19b5e
Fix syntax
stefankiesz dd65e53
Shorten path for windows CI build
stefankiesz 0247b51
cd into new path
stefankiesz 78e2970
Trying with "curl-d"
stefankiesz 9330277
more
stefankiesz 98cf950
more
stefankiesz fa02b3f
Print link dirs
stefankiesz a0946bb
Brute force linking working
stefankiesz 2fe1471
Separate into conditional
stefankiesz 709e3ba
Switch order of linked libs to fix static build
stefankiesz 6bc18f3
Only build with crypto if building common curl
stefankiesz e7fbe19
Undo
stefankiesz 49d8af8
more
stefankiesz c41dacf
Set OPEN_SRC_INCLUDE_DIRS regardless of BUILD_DEPENDENCIES
stefankiesz 37ad49d
Testing with find_package removed
stefankiesz bb2004b
Link "libwebsockets"
stefankiesz 9ba15b2
more testing
stefankiesz 78836b5
more
stefankiesz 51eebb4
Add in the crypto libs for commonLWS
stefankiesz 4113240
more
stefankiesz 9e26a85
more
stefankiesz cb83157
more
stefankiesz 0295cea
Reverting changes to libwebsockets-cmakelists.txt
stefankiesz f04658d
more
stefankiesz 3bec97c
more
stefankiesz 0464ba2
Add logs
stefankiesz e7df7c0
develop
stefankiesz 0d2ab42
more
stefankiesz 8d6a48c
Removing this line to verify this was the issue
stefankiesz f47cdbe
Revert to originally working version with some changes kept
stefankiesz 77adbf3
Try fix EVP_sha256 undefined
stefankiesz a758022
works, remove hardcode openssl
stefankiesz 0a60e7b
Should all work now...
stefankiesz 60647df
Trying to fix Windows runtime errors
stefankiesz 9e5140a
Revert "Trying to fix Windows runtime errors"
stefankiesz d3afb1c
Add comments, cleanup
stefankiesz be81fba
More commenting and cleanup
stefankiesz 4d27f7a
comment
stefankiesz e69543f
Cleanup setting of linker paths for Windows
stefankiesz 93993b0
Remove unlinking of openssl from CI tests
stefankiesz 129262a
Specify openssl build path when from built from source, tested static…
stefankiesz f952306
Switch local openssl test to local everything
stefankiesz a392dc0
Unset DYLD_LIBRARY_PATH
stefankiesz 69c3758
Print DYLD_LIBRARY_PATH
stefankiesz 5dd013b
Set openssl root directory for curl to find
stefankiesz e7b922e
Trying more
stefankiesz 18f5bde
more
stefankiesz 85f6d8b
more
stefankiesz 3946c18
more
stefankiesz 1b61699
more
stefankiesz 2ba56c9
more
stefankiesz 269630c
more
stefankiesz a5a535f
printing all openssl find_package vars
stefankiesz 38424d9
Switch my curl fork
stefankiesz 9b9be56
Isolate job, verify unlink openssl works
stefankiesz 6432c50
Try setting dyld lib path
stefankiesz eb20224
Revert "Remove unlinking of openssl from CI tests"
stefankiesz 3278951
Remove setting of openssldir
stefankiesz 0b27c82
Tested BUILD_DEPS off for common curl
stefankiesz a9541a1
Update CI tests
stefankiesz aa8ea9e
Install GTest
stefankiesz 58da8fe
Add tests
stefankiesz ec5c13f
Merge branch 'master' into cmake-cleanup
stefankiesz 1216f3d
Revert "Merge branch 'master' into cmake-cleanup"
stefankiesz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typo: int -> in