[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Battica=5D_/=3A_Fixed_a_issue_withe_the_ATTICA=5FSTA?=
From:       Alexandru Tudorica <tudalex () gmail ! com>
Date:       2011-07-11 12:03:24
Message-ID: 20110711120324.8521AA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit d7389928de06e9ea75f1a3354eac5cbf114cc390 by Alexandru Tudorica.
Committed on 11/07/2011 at 14:02.
Pushed by tudorica into branch 'master'.

Fixed a issue withe the ATTICA_STATIC_BUILD when it was set to On or Off.

M  +1    -1    CMakeLists.txt     
M  +3    -2    lib/atticaclient_export.h.cmake     

http://commits.kde.org/attica/d7389928de06e9ea75f1a3354eac5cbf114cc390

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9e25e2..620112d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ add_definitions( -DQT_NO_CAST_TO_ASCII )
 add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 
 # Enable static build
-option(ATTICA_STATIC_BUILD "Build a static library" FALSE)
+option(ATTICA_STATIC_BUILD "Build a static library" Off)
 
 # Enable unit testing
 option(ATTICA_ENABLE_TESTS "Enable tests")
diff --git a/lib/atticaclient_export.h.cmake b/lib/atticaclient_export.h.cmake
index 3a0cc6f..168e78c 100644
--- a/lib/atticaclient_export.h.cmake
+++ b/lib/atticaclient_export.h.cmake
@@ -1,6 +1,7 @@
 /*
     Copyright (c) 2009 Eckhart Wörner <ewoerner@kde.org>
     Copyright (c) 2009 Frederik Gladhorn <gladhorn@kde.org>
+    Copyright (c) 2011 Tudorica Constantin-Alexandru <tudalex@gmail.com>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -24,10 +25,10 @@
 
 #include <QtCore/QtGlobal>
 
-#define STATIC_BUILD ${ATTICA_STATIC_BUILD}
+#cmakedefine01 ATTICA_STATIC_BUILD
 
 #ifndef ATTICA_EXPORT
-# if ${ATTICA_STATIC_BUILD}
+# if ATTICA_STATIC_BUILD
    /* No export/import for static libraries */
 #  define ATTICA_EXPORT
 # elif defined(ATTICA_LIB_MAKEDLL)

[prev in list] [next in list] [prev in thread] [next in thread]