stv0g/Criterion
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

nanomsg: Remove patch dependency and use upstream project

Browse source
This commit is contained in:
Snaipe 2016-08-07 18:10:47 +02:00
parent eb70ea8ae1
commit 1d6f0c6822
4 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -16,9 +16,6 @@
[submodule "dependencies/nanomsg"] [submodule "dependencies/nanomsg"]
path = dependencies/nanomsg path = dependencies/nanomsg
url = https://github.com/nanomsg/nanomsg.git url = https://github.com/nanomsg/nanomsg.git
[submodule "dependencies/nanomsg-patched"]
path = dependencies/nanomsg-patched
url = https://github.com/Snaipe/nanomsg.git
[submodule "dependencies/debugbreak"] [submodule "dependencies/debugbreak"]
path = dependencies/debugbreak path = dependencies/debugbreak
url = https://github.com/scottt/debugbreak url = https://github.com/scottt/debugbreak

4
CMakeLists.txt
View file

@ -35,12 +35,12 @@ else ()
endif () endif ()
cr_add_subproject (nanomsg cr_add_subproject (nanomsg
PATH dependencies/nanomsg-patched PATH dependencies/nanomsg
OPTS OPTS
-DNN_TESTS=OFF -DNN_TESTS=OFF
-DNN_TOOLS=OFF -DNN_TOOLS=OFF
-DNN_FORK_STRATEGY=RESET
-DNN_STATIC_LIB=ON -DNN_STATIC_LIB=ON
-DCMAKE_INSTALL_LIBDIR=lib
"-DCMAKE_C_FLAGS=${NN_C_FLAGS}" "-DCMAKE_C_FLAGS=${NN_C_FLAGS}"
CMAKE CMAKE
) )

2
dependencies/nanomsg vendored

@ -1 +1 @@
Subproject commit fd66ff55a5bad44ea0c3cca8bea345b6f02663bf Subproject commit 7e12a20e038234060d41d03c20721d08117f8607

1
dependencies/nanomsg-patched vendored

@ -1 +0,0 @@
Subproject commit 8e0095aa750f300003afb27cb408df3f9b6b2364