From 683d52bc4852faaf1d33b28dc5ce830073f35ac2 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 9 Oct 2009 20:05:08 +0000 Subject: [PATCH] - DSM sub-modules common includedir was moved to dsm.lib.rules.txt. Signed-off-by: Peter Lemenkov git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1515 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- apps/dsm/CMakeLists.txt | 3 --- cmake/dsm.lib.rules.txt | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/dsm/CMakeLists.txt b/apps/dsm/CMakeLists.txt index 366f9362..6633d2d0 100644 --- a/apps/dsm/CMakeLists.txt +++ b/apps/dsm/CMakeLists.txt @@ -10,9 +10,6 @@ DSMStateDiagramCollection.cpp DSMStateEngine.cpp ) -# needed for DSM sub-modules -INCLUDE_DIRECTORIES (.) - ADD_SUBDIRECTORY (lib) ADD_SUBDIRECTORY (mods) diff --git a/cmake/dsm.lib.rules.txt b/cmake/dsm.lib.rules.txt index c0390bcc..c7daa27b 100644 --- a/cmake/dsm.lib.rules.txt +++ b/cmake/dsm.lib.rules.txt @@ -1,5 +1,8 @@ # A place for common parts of SEMS DSM modules rules -# + +# We must add base apps/dsm directory as INCLUDEDIR +INCLUDE_DIRECTORIES (../..) + # We adding sems_dsm_ prefix to the internal name of the library to avoid nasty # issue then this name is equals to external library, our module links to. # E.g. the issue, then speex module should be linked to -lspeex