From ca33f3f9b863014b8be2879b956a28d31833f235 Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jussi.pakkanen@canonical.com>
Date: Thu, 18 Oct 2012 14:18:13 +0300
Subject: Removed useless dependencies.

(bzr r2861.2.1)
---
 unity-standalone/CMakeLists.txt | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'unity-standalone')

diff --git a/unity-standalone/CMakeLists.txt b/unity-standalone/CMakeLists.txt
index f93784b10..f04cd62e6 100644
--- a/unity-standalone/CMakeLists.txt
+++ b/unity-standalone/CMakeLists.txt
@@ -32,12 +32,6 @@ set (STANDALONE_SOURCES
      )
 
 add_executable (unity-standalone StandaloneUnity.cpp)
-add_dependencies (unity-standalone 
-                  dash-lib
-                  launcher-lib
-                  panel-lib
-                  unity-shared
-                  unity-shared-standalone)
 target_link_libraries (unity-standalone 
                        dash-lib
                        launcher-lib
-- 
cgit v1.2.3


From e20bae5c1000e95979e4ce0af7c859072a173437 Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jussi.pakkanen@canonical.com>
Date: Thu, 18 Oct 2012 14:45:32 +0300
Subject: Obtain GETTEXT_PACKAGE from config.h on demand rather than specify it
 with -D to every compiled file.

(bzr r2861.2.2)
---
 unity-standalone/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'unity-standalone')

diff --git a/unity-standalone/CMakeLists.txt b/unity-standalone/CMakeLists.txt
index f04cd62e6..4f534e4ae 100644
--- a/unity-standalone/CMakeLists.txt
+++ b/unity-standalone/CMakeLists.txt
@@ -5,7 +5,6 @@ find_package (PkgConfig)
 set (CFLAGS
      ${CACHED_UNITY_DEPS_CFLAGS}
      ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
-     "-DGETTEXT_PACKAGE=\"unity\""
      "-I${CMAKE_CURRENT_BINARY_DIR}"
      )
 
-- 
cgit v1.2.3


From de55c98cebfb5a3e759c0a6aea5b5b68f2a3aa5d Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jussi.pakkanen@canonical.com>
Date: Thu, 18 Oct 2012 15:08:03 +0300
Subject: Removed useless -I flags.

(bzr r2861.2.3)
---
 unity-standalone/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'unity-standalone')

diff --git a/unity-standalone/CMakeLists.txt b/unity-standalone/CMakeLists.txt
index 4f534e4ae..898020576 100644
--- a/unity-standalone/CMakeLists.txt
+++ b/unity-standalone/CMakeLists.txt
@@ -5,7 +5,6 @@ find_package (PkgConfig)
 set (CFLAGS
      ${CACHED_UNITY_DEPS_CFLAGS}
      ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
-     "-I${CMAKE_CURRENT_BINARY_DIR}"
      )
 
 if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
-- 
cgit v1.2.3


From 24f490cd85598a80233382aea4227215ffff3ad4 Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jussi.pakkanen@canonical.com>
Date: Thu, 18 Oct 2012 15:25:39 +0300
Subject: Removed cargo cult include directories.

(bzr r2861.2.4)
---
 unity-standalone/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'unity-standalone')

diff --git a/unity-standalone/CMakeLists.txt b/unity-standalone/CMakeLists.txt
index 898020576..d86a1a1e5 100644
--- a/unity-standalone/CMakeLists.txt
+++ b/unity-standalone/CMakeLists.txt
@@ -20,7 +20,7 @@ link_libraries (${LIBS})
 set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})
 link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})
 
-include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
 
 #
 # Headers & Sources
-- 
cgit v1.2.3