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

Temporarily used patched nanomsg for tests

Browse source
This commit is contained in:
Snaipe 2016-01-15 12:13:05 +01:00
parent 48346747b9
commit 7c01e372c2
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitmodules vendored
View file

@ -16,3 +16,7 @@
[submodule "dependencies/nanomsg"]
path = dependencies/nanomsg
url = https://github.com/nanomsg/nanomsg.git
[submodule "dependencies/nanomsg-patched"]
path = dependencies/nanomsg-patched
url = https://github.com/Snaipe/nanomsg.git
branch = fork-patch

15
CMakeLists.txt
View file

@ -36,12 +36,12 @@ include(ExternalProject)
externalproject_add(
nanomsg
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/nanomsg"
PREFIX "${CMAKE_CURRENT_BINARY_DIR}/nanomsg"
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/nanomsg-patched"
PREFIX "${CMAKE_CURRENT_BINARY_DIR}/nanomsg-patched"
UPDATE_COMMAND <SOURCE_DIR>/autogen.sh
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --disable-examples
BUILD_COMMAND make
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR>
BUILD_COMMAND make -j4
INSTALL_COMMAND make install
)
@ -54,11 +54,11 @@ include_directories(
dependencies/klib/
dependencies/nanopb/
${CMAKE_CURRENT_BINARY_DIR}/nanomsg/include/
${CMAKE_CURRENT_BINARY_DIR}/nanomsg-patched/include/
)
link_directories(
${CMAKE_CURRENT_BINARY_DIR}/nanomsg/lib/
${CMAKE_CURRENT_BINARY_DIR}/nanomsg-patched/lib/
)
if (MSVC)
@ -287,8 +287,9 @@ configure_file(
include_directories(include src)
add_library(criterion SHARED ${SOURCE_FILES} ${INTERFACE_FILES})
add_dependencies(criterion nanomsg)
target_link_libraries(criterion csptr anl libnanomsg.a)
target_link_libraries(criterion csptr anl libnanomsg.a pthread)
if (THEORIES)
target_link_libraries(criterion dyncall_s)