Fixed external project build for nanomsg

This commit is contained in:
Snaipe 2016-01-17 15:43:54 +01:00
parent d405e640ed
commit 9562260201
2 changed files with 17 additions and 10 deletions

View file

@ -33,17 +33,24 @@ include_directories(SYSTEM
)
if (MSVC)
set(NN_INCL_DIR ${CMAKE_CURRENT_BINARY_DIR}/nanomsg-patched/include)
set(NN_INCL_DEST ${NN_INCL_DIR}/nanomsg)
set(NN_TESTS OFF)
set(NN_TOOLS OFF)
add_subdirectory(dependencies/nanomsg-patched EXCLUDE_FROM_ALL)
file(GLOB NN_HEADERS "dependencies/nanomsg-patched/src/*.h")
file(MAKE_DIRECTORY "${NN_INCL_DEST}")
file(COPY ${NN_HEADERS} DESTINATION "${NN_INCL_DEST}")
include(ExternalProject)
externalproject_add(
nanomsg
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/nanomsg-patched"
PREFIX "${CMAKE_CURRENT_BINARY_DIR}/nanomsg-patched"
UPDATE_COMMAND ""
CONFIGURE_COMMAND "${CMAKE_COMMAND} -DNN_TESTS=OFF <SOURCE_DIR>"
)
externalproject_get_property(nanomsg install_dir)
set(NANOMSG_INSTALL_DIR "${install_dir}")
include_directories(${CMAKE_CURRENT_BINARY_DIR}/nanomsg-patched/include/)
link_directories(${CMAKE_CURRENT_BINARY_DIR}/nanomsg-patched/lib/)
include_directories("${NN_INCL_DIR}")
else ()
include(ExternalProject)

@ -1 +1 @@
Subproject commit e0d49e180b93ad1557f447d43654d28793512aca
Subproject commit 347de44744682ac0a60ad9df461bbb27724afd15