hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2017-03-07 17:07:05 +01:00
commit 8b62c1c664
5 changed files with 57 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -243,8 +243,10 @@ install(
########################################
add_custom_command(TARGET mist
POST_BUILD
COMMAND mkdir -p ${BINARY_DIR}/mist
COMMAND cp ${libHeaders} ${BINARY_DIR}/mist
COMMAND ${CMAKE_COMMAND}
ARGS -E make_directory ${BINARY_DIR}/mist
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different ${libHeaders} ${BINARY_DIR}/mist
DEPENDS ${libHeaders}
)
@ -438,10 +440,10 @@ endif(DOXYGEN_FOUND)
if (CMAKE_CROSSCOMPILING)
set(RUNA "1")
else()
try_run(RUNA RUNB ${BINARY_DIR}/CMakeTmp ${SOURCE_DIR}/src/sourcery.cpp)
try_run(RUNA RUNB ${BINARY_DIR}/CMakeTmp ${SOURCE_DIR}/src/sourcery.cpp )
endif()
if("${RUNA}" EQUAL "0")
if("${RUNA}" EQUAL "2")
message("Not cross compiling - building sourcery")
add_executable(sourcery
src/sourcery.cpp