From 6ed6d80065ff6b24296f6427c3f5a2bcbf6ac32b Mon Sep 17 00:00:00 2001
From: Francois Bleibel <fbleibel@gmail.com>
Date: Tue, 29 Jun 2010 15:24:28 +0900
Subject: [PATCH] Removed default definition of VP_DEBUG_MODE in cmake (already
in header).
---
include/CMakeLists.txt | 4 +++-
include/dynamic-graph/dynamic-graph-api.h | 2 +-
src/CMakeLists.txt | 7 +++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 46f9dbb..77e3550 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -14,7 +14,7 @@ pool.h
exception-abstract.h
exception-factory.h
exception-signal.h
-
+exception-traces.h
shell-functions.h
shell-procedure.h
@@ -30,6 +30,8 @@ time-dependency.h
time-dependency.t.cpp
signal-caster.h
all-signals.h
+
+
)
# Recreate correct path for the headers
diff --git a/include/dynamic-graph/dynamic-graph-api.h b/include/dynamic-graph/dynamic-graph-api.h
index cbdd64e..0e6f1c7 100644
--- a/include/dynamic-graph/dynamic-graph-api.h
+++ b/include/dynamic-graph/dynamic-graph-api.h
@@ -6,7 +6,7 @@
#define DYNAMICGRAPH_API_H
#if defined (WIN32)
-# ifdef DYNAMICGRAPH_EXPORT
+# ifdef dynamic_graph_EXPORT
# define DYNAMICGRAPH_EXPORT __declspec(dllexport)
# else
# define DYNAMICGRAPH_EXPORT __declspec(dllimport)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9b7c361..1f0a741 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,11 +8,10 @@ INCLUDE_DIRECTORIES(
)
# Verbosity level
-IF (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\")
- ADD_DEFINITIONS(-DVP_DEBUG_MODE=0)
-ELSE (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\")
+
+IF (NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\"))
ADD_DEFINITIONS(-DVP_DEBUG_MODE=${CMAKE_VERBOSITY_LEVEL} -DVP_DEBUG)
-ENDIF (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\")
+ENDIF (NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\"))
ADD_LIBRARY(${LIBRARY_NAME}
SHARED
--
GitLab