[prev in list] [next in list] [prev in thread] [next in thread]
List: semsdev
Subject: [Semsdev] git:master: c/f: fix APP_NAME for CMake build system
From: Stefan Sayer <stefan.sayer () googlemail ! com>
Date: 2014-02-27 14:53:23
Message-ID: 20140227145323.2E5DDEF8074 () rimmer ! ryngle ! com
[Download RAW message or body]
Module: sems
Branch: master
Commit: 6aff5f86174ba8129be11641d81875e84c44f973
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=6aff5f86174ba8129be11641d81875e84c44f973
Author: Stefan Sayer <stefan.sayer@googlemail.com>
Committer: Stefan Sayer <stefan.sayer@googlemail.com>
Date: Thu Feb 27 15:40:31 2014 +0100
c/f: fix APP_NAME for CMake build system
---
CMakeLists.txt | 2 ++
core/log.cpp | 1 +
core/sems.h.cmake | 2 ++
3 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e809a1..9959d24 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,8 @@ ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/.git)
MESSAGE(STATUS "Configuring ${CMAKE_PROJECT_NAME} v. ${SEMS_VERSION}")
+SET(SEMS_APP_NAME "sems")
+
IF(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE)
message(FATAL_ERROR "In-source builds are not allowed.
CMake would overwrite all makefiles distributed with SEMS.
diff --git a/core/log.cpp b/core/log.cpp
index 79d706b..67ddc13 100644
--- a/core/log.cpp
+++ b/core/log.cpp
@@ -28,6 +28,7 @@
#include <ctype.h>
#include <stdio.h>
#include <unistd.h>
+#include "sems.h"
#ifndef DISABLE_SYSLOG_LOG
# include <syslog.h>
diff --git a/core/sems.h.cmake b/core/sems.h.cmake
index ff53f3d..1c2cccd 100644
--- a/core/sems.h.cmake
+++ b/core/sems.h.cmake
@@ -32,6 +32,8 @@
#define OS "${CMAKE_SYSTEM_NAME}"
#define ARCH "${CMAKE_SYSTEM_PROCESSOR}"
+#define SEMS_APP_NAME "${SEMS_APP_NAME}"
+
#define CONFIG_FILE "${SEMS_CFG_PREFIX}/etc/sems/sems.conf"
#define MOD_CFG_PATH "${SEMS_CFG_PREFIX}/etc/sems/etc/"
#define ANNOUNCE_PATH "${SEMS_AUDIO_PREFIX}/sems/audio"
_______________________________________________
Semsdev mailing list
Semsdev@lists.iptel.org
http://lists.iptel.org/mailman/listinfo/semsdev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic