This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to tag v1.0.0 in repository osmium-tool.
commit c119033a3783994e2c25baa4fcb26f0753265dd6 Author: Jochen Topf <joc...@topf.org> Date: Thu Jan 29 16:04:27 2015 +0100 Simplified configuration. Removed need for config.hpp. --- CMakeLists.txt | 17 ++++------------- src/config.hpp.in | 3 --- src/osmc.hpp | 2 -- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a24e6f1..76ddf78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,8 @@ set(OSMIUM_VERSION_PATCH 1) set(OSMIUM_VERSION ${OSMIUM_VERSION_MAJOR}.${OSMIUM_VERSION_MINOR}.${OSMIUM_VERSION_PATCH}) +add_definitions(-DOSMIUM_VERSION="${OSMIUM_VERSION}") + #---------------------------------------------------------------------- # @@ -127,19 +129,6 @@ endif(ASTYLE) #---------------------------------------------------------------------- # -# Create src/config.hpp -# -#---------------------------------------------------------------------- -configure_file( - ${PROJECT_SOURCE_DIR}/src/config.hpp.in - ${PROJECT_BINARY_DIR}/src/config.hpp -) - -include_directories(${PROJECT_BINARY_DIR}/src) - - -#---------------------------------------------------------------------- -# # Decide which C++ version to use (Minimum/default: C++11). # #---------------------------------------------------------------------- @@ -180,6 +169,8 @@ set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING #---------------------------------------------------------------------- +include_directories(${PROJECT_BINARY_DIR}/src) + add_subdirectory(src) diff --git a/src/config.hpp.in b/src/config.hpp.in deleted file mode 100644 index a69e07b..0000000 --- a/src/config.hpp.in +++ /dev/null @@ -1,3 +0,0 @@ - -#define OSMIUM_VERSION "@OSMIUM_VERSION@" - diff --git a/src/osmc.hpp b/src/osmc.hpp index 838437e..b346a66 100644 --- a/src/osmc.hpp +++ b/src/osmc.hpp @@ -31,8 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <osmium/util/verbose_output.hpp> -#include "config.hpp" - /** * Virtual base class for commands that can be called from the command line. */ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel