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

Fix CMake problem with headers, fixed sourcery cross compile detection

Browse source
This commit is contained in:
Thulinma 2017-03-07 17:00:49 +01:00
parent 0ea100758d
commit 907d48b7e5
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -194,8 +194,10 @@ install(
######################################## ########################################
add_custom_command(TARGET mist add_custom_command(TARGET mist
POST_BUILD POST_BUILD
COMMAND mkdir -p ${BINARY_DIR}/mist COMMAND ${CMAKE_COMMAND}
COMMAND cp ${libHeaders} ${BINARY_DIR}/mist ARGS -E make_directory ${BINARY_DIR}/mist
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different ${libHeaders} ${BINARY_DIR}/mist
DEPENDS ${libHeaders} DEPENDS ${libHeaders}
) )
@ -358,10 +360,10 @@ endif(DOXYGEN_FOUND)
if (CMAKE_CROSSCOMPILING) if (CMAKE_CROSSCOMPILING)
set(RUNA "1") set(RUNA "1")
else() 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() endif()
if("${RUNA}" EQUAL "0") if("${RUNA}" EQUAL "2")
message("Not cross compiling - building sourcery") message("Not cross compiling - building sourcery")
add_executable(sourcery add_executable(sourcery
src/sourcery.cpp src/sourcery.cpp

2
src/sourcery.cpp
View file

@ -8,7 +8,7 @@
int main(int argc, char* argv[]){ int main(int argc, char* argv[]){
if (argc < 4) { if (argc < 4) {
std::cerr << "Usage: " << argv[0] << " <inputFile> <variableName> <outputFile>" << std::endl; std::cerr << "Usage: " << argv[0] << " <inputFile> <variableName> <outputFile>" << std::endl;
return 1; return 2;
} }
std::ofstream tmp(argv[3]); std::ofstream tmp(argv[3]);
//begin the first line //begin the first line