diff options
| -rw-r--r-- | chill/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | chill/src/chill_run.cc | 2 | ||||
| -rw-r--r-- | omegalib/omega_calc/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | omegalib/omega_calc/src/parser.yy | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/chill/CMakeLists.txt b/chill/CMakeLists.txt index 50ab420..3345a8c 100644 --- a/chill/CMakeLists.txt +++ b/chill/CMakeLists.txt @@ -39,9 +39,9 @@ set(PYTHON_SRC ${BISON_ExprParser_OUTPUTS} ) -set(COMMON_FLAGS "-DBUILD_ROSE -DCHILL_BUILD_DATE=\"${build_date}\" -DCHILL_BUILD_VERSION=\"\\\"0.2.1\\\"\"") +set(COMMON_FLAGS "-DCHILL_BUILD_DATE=\"${build_date}\" -DCHILL_BUILD_VERSION=\"\\\"${CHILL_VERSION}\\\"\"") -set(CMAKE_CXX_FLAGS "-DPYTHON ${COMMON_FLAGS}") +set(CMAKE_CXX_FLAGS "${COMMON_FLAGS} ${CMAKE_CXX_FLAGS}") if (DEFINED OMEGAHOME) link_directories(${OMEGAHOME}/lib) diff --git a/chill/src/chill_run.cc b/chill/src/chill_run.cc index afebbb4..4eafe65 100644 --- a/chill/src/chill_run.cc +++ b/chill/src/chill_run.cc @@ -61,7 +61,7 @@ int main( int argc, char* argv[] ) //--- // Run a CHiLL interpreter //--- - printf("CHiLL v0.2.1 (built on %s)\n", CHILL_BUILD_DATE); + printf("CHiLL v" CHILL_BUILD_VERSION " (built on " CHILL_BUILD_DATE ")\n"); printf("Copyright (C) 2008 University of Southern California\n"); printf("Copyright (C) 2009-2012 University of Utah\n"); //is_interactive = true; // let the lua interpreter know. diff --git a/omegalib/omega_calc/CMakeLists.txt b/omegalib/omega_calc/CMakeLists.txt index ad1279c..546780b 100644 --- a/omegalib/omega_calc/CMakeLists.txt +++ b/omegalib/omega_calc/CMakeLists.txt @@ -1,3 +1,5 @@ +set(OC_VERSION 2.2.3) + find_package(BISON) find_package(FLEX) @@ -14,7 +16,7 @@ include_directories( string(TIMESTAMP build_date "\\\"%m/%d/%Y\\\"") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBUILD_CODEGEN -DOMEGA_BUILD_DATE=\"${build_date}\"") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBUILD_CODEGEN -DOC_VERSION=\"\\\"OC_VERSION\\\"\" -DOC_BUILD_DATE=\"${build_date}\"") add_executable(omega_calc EXCLUDE_FROM_ALL diff --git a/omegalib/omega_calc/src/parser.yy b/omegalib/omega_calc/src/parser.yy index cad6e8e..896f926 100755 --- a/omegalib/omega_calc/src/parser.yy +++ b/omegalib/omega_calc/src/parser.yy @@ -1875,7 +1875,7 @@ int main(int argc, char **argv) { #else std::cout << "Omega+ "; #endif - std::cout << "v2.2.3 (built on " OMEGA_BUILD_DATE ")" << std::endl; + std::cout << "v" OC_VERSION " (built on " OC_BUILD_DATE ")" << std::endl; std::cout << "Copyright (C) 1994-2000 the Omega Project Team" << std::endl; std::cout << "Copyright (C) 2005-2011 Chun Chen" << std::endl; std::cout << "Copyright (C) 2011-2012 University of Utah" << std::endl; |