fly/terragear
1
0
Fork 0
Code Activity

terrafit: another go at versioning

Browse source
This commit is contained in:
Christian Schmitt 2012-12-05 00:06:33 +01:00
parent 0f2b36bb16
commit c9ab625a03
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -132,6 +132,10 @@ include_directories(
add_definitions(-DHAVE_CONFIG_H)
include_directories(${PROJECT_SOURCE_DIR}/src)
include_directories(${PROJECT_BINARY_DIR}/src)
include_directories(${PROJECT_BINARY_DIR}/src/Include)
# configure a header file to pass some of the CMake settings
# to the source code
configure_file (
@ -144,9 +148,6 @@ configure_file (
"${PROJECT_BINARY_DIR}/src/Include/version.h"
)
include_directories(${PROJECT_SOURCE_DIR}/src)
include_directories(${PROJECT_BINARY_DIR}/src/Include)
add_subdirectory(src)
#add_subdirectory(gismodules)

5
src/Prep/TerraFit/terrafit.cc
View file

@ -54,6 +54,7 @@
#include <simgear/threads/SGThread.hxx>
#include <Array/array.hxx>
#include <Include/version.h>
#include <Prep/Terra/GreedyInsert.h>
#include <Prep/Terra/Map.h>
#include <Prep/Terra/Mask.h>
@ -323,7 +324,7 @@ int main(int argc, char** argv) {
force=true;
break;
case 'v':
SG_LOG(SG_GENERAL,SG_INFO,argv[0] << " version unknown");
SG_LOG(SG_GENERAL,SG_INFO,argv[0] << " version " << getTGVersion());
exit(0);
break;
case 'j':
@ -335,7 +336,7 @@ int main(int argc, char** argv) {
}
}
SG_LOG(SG_GENERAL, SG_INFO, "TerraFit version unknown");
SG_LOG(SG_GENERAL, SG_INFO, "TerraFit version " << getTGVersion());
SG_LOG(SG_GENERAL, SG_INFO, "Min points = " << min_points);
SG_LOG(SG_GENERAL, SG_INFO, "Max points = " << point_limit);
SG_LOG(SG_GENERAL, SG_INFO, "Max error = " << error_threshold);