From 3935228afe9fd369ba1afdebae32f3eaa2910260 Mon Sep 17 00:00:00 2001 From: Andreas Waidler Date: Sun, 14 Aug 2011 18:42:43 +0200 Subject: [PATCH] Fixed include directory name. --- CMakeLists.txt | 2 +- TODO | 3 +++ doc/Doxyfile.in | 2 +- {source => libsex}/CMakeLists.txt | 0 {source => libsex}/Exception.cxx | 2 +- {source => libsex}/Exception.hxx | 0 {source => libsex}/declare.hxx | 2 +- {source => libsex}/define.hxx | 0 {source => libsex}/throw.hxx | 2 +- {source => libsex}/utility.cxx | 2 +- {source => libsex}/utility.hxx | 2 +- {source => libsex}/utility.ixx | 2 +- tests/UsageExamples.cxx | 2 +- tests/Utility.cxx | 2 +- tests/framework/CountingException.hxx | 2 +- tests/framework/ExampleException1.cxx | 5 ++--- tests/framework/ExampleException1.hxx | 5 ++--- tests/framework/ExampleException2.cxx | 5 ++--- tests/framework/ExampleException2.hxx | 5 ++--- tests/framework/MockException.hxx | 2 +- tests/framework/UncloneableException.hxx | 2 +- 21 files changed, 24 insertions(+), 25 deletions(-) rename {source => libsex}/CMakeLists.txt (100%) rename {source => libsex}/Exception.cxx (98%) rename {source => libsex}/Exception.hxx (100%) rename {source => libsex}/declare.hxx (92%) rename {source => libsex}/define.hxx (100%) rename {source => libsex}/throw.hxx (97%) rename {source => libsex}/utility.cxx (97%) rename {source => libsex}/utility.hxx (98%) rename {source => libsex}/utility.ixx (93%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c97cb5b..c10a94a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ ADD_DEFINITIONS("-Wno-variadic-macros") INCLUDE_DIRECTORIES(.) # This one contains our code. -ADD_SUBDIRECTORY(source) +ADD_SUBDIRECTORY(${LIBRARY_NAME}) # That one the documentation. ADD_SUBDIRECTORY(doc EXCLUDE_FROM_ALL) diff --git a/TODO b/TODO index d7579be..3b8a007 100644 --- a/TODO +++ b/TODO @@ -1 +1,4 @@ +* win install fix +* CFLAGS for GCC only * it should be possible to install documentation +* Function names (compiler dependent) in error str. diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 71f088e..629c953 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -610,7 +610,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = "@PROJECT_SOURCE_DIR@/source" +INPUT = "@PROJECT_SOURCE_DIR@/libsex" # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is diff --git a/source/CMakeLists.txt b/libsex/CMakeLists.txt similarity index 100% rename from source/CMakeLists.txt rename to libsex/CMakeLists.txt diff --git a/source/Exception.cxx b/libsex/Exception.cxx similarity index 98% rename from source/Exception.cxx rename to libsex/Exception.cxx index 03f54d3..cba2cc6 100644 --- a/source/Exception.cxx +++ b/libsex/Exception.cxx @@ -4,7 +4,7 @@ * Definition of @ref libsex::Exception. */ -#include +#include #include // strncpy() libsex::Exception::Exception(const char* const message) diff --git a/source/Exception.hxx b/libsex/Exception.hxx similarity index 100% rename from source/Exception.hxx rename to libsex/Exception.hxx diff --git a/source/declare.hxx b/libsex/declare.hxx similarity index 92% rename from source/declare.hxx rename to libsex/declare.hxx index 5005b45..365509f 100644 --- a/source/declare.hxx +++ b/libsex/declare.hxx @@ -7,7 +7,7 @@ #ifndef LIBSEX_DECLARE_HXX #define LIBSEX_DECLARE_HXX -#include +#include /// Macro for declaring exception classes (.hxx). #define LIBSEX_DECLARE(parent, name) \ diff --git a/source/define.hxx b/libsex/define.hxx similarity index 100% rename from source/define.hxx rename to libsex/define.hxx diff --git a/source/throw.hxx b/libsex/throw.hxx similarity index 97% rename from source/throw.hxx rename to libsex/throw.hxx index 5f67303..fca72b9 100644 --- a/source/throw.hxx +++ b/libsex/throw.hxx @@ -7,7 +7,7 @@ #ifndef LIBSEX_THROW_HXX #define LIBSEX_THROW_HXX -#include +#include /** * Macro to throw an exception without any argument. diff --git a/source/utility.cxx b/libsex/utility.cxx similarity index 97% rename from source/utility.cxx rename to libsex/utility.cxx index f8317b9..0633935 100644 --- a/source/utility.cxx +++ b/libsex/utility.cxx @@ -5,7 +5,7 @@ * functions. */ -#include +#include #include bool libsex::vformat( diff --git a/source/utility.hxx b/libsex/utility.hxx similarity index 98% rename from source/utility.hxx rename to libsex/utility.hxx index 4b1ec48..c081442 100644 --- a/source/utility.hxx +++ b/libsex/utility.hxx @@ -8,7 +8,7 @@ #ifndef LIBSEX_UTILITY_HXX #define LIBSEX_UTILITY_HXX -#include +#include #include // variadic argument fun #include // size_t diff --git a/source/utility.ixx b/libsex/utility.ixx similarity index 93% rename from source/utility.ixx rename to libsex/utility.ixx index 0f11560..9f810d8 100644 --- a/source/utility.ixx +++ b/libsex/utility.ixx @@ -4,7 +4,7 @@ * Templates of formatting-related internal functions. */ -#include // Exception::LENGTH +#include // Exception::LENGTH template T libsex::formatted( diff --git a/tests/UsageExamples.cxx b/tests/UsageExamples.cxx index 20cb3d0..c204b83 100644 --- a/tests/UsageExamples.cxx +++ b/tests/UsageExamples.cxx @@ -10,7 +10,7 @@ // Usage examples begin now. -#include +#include #include #include diff --git a/tests/Utility.cxx b/tests/Utility.cxx index 6d1c4f7..ae8acd7 100644 --- a/tests/Utility.cxx +++ b/tests/Utility.cxx @@ -1,7 +1,7 @@ #include #include -#include +#include #include diff --git a/tests/framework/CountingException.hxx b/tests/framework/CountingException.hxx index 7822d6b..0431894 100644 --- a/tests/framework/CountingException.hxx +++ b/tests/framework/CountingException.hxx @@ -1,7 +1,7 @@ #ifndef COUNTINGEXCEPTION_HXX #define COUNTINGEXCEPTION_HXX -#include +#include class CountingException : public libsex::Exception { diff --git a/tests/framework/ExampleException1.cxx b/tests/framework/ExampleException1.cxx index 32f7dd1..57bb52b 100644 --- a/tests/framework/ExampleException1.cxx +++ b/tests/framework/ExampleException1.cxx @@ -3,9 +3,8 @@ * Shows how to _define_ a basic exception class. */ -// Remember to adjust include path (replace "source" by "libsex"). -#include -#include +#include +#include #include // Define ExampleException1 and provide a message template. diff --git a/tests/framework/ExampleException1.hxx b/tests/framework/ExampleException1.hxx index bc1efca..112ca33 100644 --- a/tests/framework/ExampleException1.hxx +++ b/tests/framework/ExampleException1.hxx @@ -7,9 +7,8 @@ #ifndef EXAMPLEEXCEPTION1_HXX #define EXAMPLEEXCEPTION1_HXX -// Remember to adjust include path (replace "source" by "libsex"). -#include -#include +#include +#include // ExampleException1 inherits from libsex::Exception. LIBSEX_DECLARE(libsex::Exception, ExampleException1) diff --git a/tests/framework/ExampleException2.cxx b/tests/framework/ExampleException2.cxx index b2b2533..a22cfce 100644 --- a/tests/framework/ExampleException2.cxx +++ b/tests/framework/ExampleException2.cxx @@ -5,9 +5,8 @@ * placeholders in its message template. */ -// Remember to adjust include path (replace "source" by "libsex"). -#include -#include +#include +#include #include // Define ExampleException2 and provide a message template diff --git a/tests/framework/ExampleException2.hxx b/tests/framework/ExampleException2.hxx index b1d3522..0e26f0d 100644 --- a/tests/framework/ExampleException2.hxx +++ b/tests/framework/ExampleException2.hxx @@ -11,9 +11,8 @@ #ifndef EXAMPLEEXCEPTION2_HXX #define EXAMPLEEXCEPTION2_HXX -// Remember to adjust include path (replace "source" by "libsex"). -#include -#include +#include +#include // ExampleException2 inherits from libsex::Exception. LIBSEX_DECLARE(libsex::Exception, ExampleException2) diff --git a/tests/framework/MockException.hxx b/tests/framework/MockException.hxx index 2d08fb4..2d04ee1 100644 --- a/tests/framework/MockException.hxx +++ b/tests/framework/MockException.hxx @@ -1,7 +1,7 @@ #ifndef MOCKEXCEPTION_HXX #define MOCKEXCEPTION_HXX -#include +#include class MockException : public libsex::Exception { diff --git a/tests/framework/UncloneableException.hxx b/tests/framework/UncloneableException.hxx index e90bdac..375de12 100644 --- a/tests/framework/UncloneableException.hxx +++ b/tests/framework/UncloneableException.hxx @@ -1,7 +1,7 @@ #ifndef UNCLONEABLEEXCEPTION_HXX #define UNCLONEABLEEXCEPTION_HXX -#include +#include class UncloneableException : public libsex::Exception { -- 2.11.4.GIT