fix up include header paths

CMakeLists.txt

@@ -77,7 +77,6 @@ if(NOT FL_BACKTRACE)
 endif()
 
 include_directories(.)
-include_directories ("${PROJECT_SOURCE_DIR}/fl/")
 add_definitions (-std=c++0x)  # -std=c++11
 
 file(STRINGS FL_HEADERS fl-headers)

fl/LoggerCpp/Channel.h

@@ -10,7 +10,7 @@
  */
 #pragma once
 
-#include "LoggerCpp/Log.h"
+#include "fl/LoggerCpp/Log.h"
 
 #include <map>
 #include <string>
@@ -19,7 +19,7 @@
 // or <memory> (or <tr1/memory>) when C++11 (or experimental C++0x) is available,
 // or a custom minimal shared_ptr implementation,
 // and imports the "shared_ptr" symbol inside the Log namespace (ie. Log::shared_ptr)
-#include "LoggerCpp/shared_ptr.hpp"
+#include "fl/LoggerCpp/shared_ptr.hpp"
 
 namespace fl {
 

fl/LoggerCpp/Config.h

@@ -18,7 +18,7 @@
 // or <memory> (or <tr1/memory>) when C++11 (or experimental C++0x) is available,
 // or a custom minimal shared_ptr implementation,
 // and imports the "shared_ptr" symbol inside the Log namespace (ie. Log::shared_ptr)
-#include "LoggerCpp/shared_ptr.hpp"
+#include "fl/LoggerCpp/shared_ptr.hpp"
 
 namespace fl {
 

fl/LoggerCpp/Exception.h

@@ -10,7 +10,7 @@
  */
 #pragma once
 
-#include "LoggerCpp/Formatter.h"
+#include "fl/LoggerCpp/Formatter.h"
 
 #include <stdexcept>
 #include <cassert>

fl/LoggerCpp/Log.h

@@ -10,8 +10,8 @@
  */
 #pragma once
 
-#include "LoggerCpp/DateTime.h"
-#include "LoggerCpp/Utils.h"
+#include "fl/LoggerCpp/DateTime.h"
+#include "fl/LoggerCpp/Utils.h"
 
 #include <sstream>
 #include <iomanip>  // For easy use of parametric manipulators (setfill, setprecision) by client code

fl/LoggerCpp/Logger.h

@@ -10,8 +10,8 @@
  */
 #pragma once
 
-#include "LoggerCpp/Log.h"
-#include "LoggerCpp/Channel.h"
+#include "fl/LoggerCpp/Log.h"
+#include "fl/LoggerCpp/Channel.h"
 
 #include <string>
 

fl/LoggerCpp/LoggerCpp.h

@@ -18,8 +18,8 @@
 
 
 // Include useful headers of LoggerC++
-#include "LoggerCpp/Logger.h"
-#include "LoggerCpp/Manager.h"
+#include "fl/LoggerCpp/Logger.h"
+#include "fl/LoggerCpp/Manager.h"
 
 
 /**

fl/LoggerCpp/Manager.h

@@ -10,10 +10,10 @@
  */
 #pragma once
 
-#include "LoggerCpp/Log.h"
-#include "LoggerCpp/Channel.h"
-#include "LoggerCpp/Output.h"
-#include "LoggerCpp/Config.h"
+#include "fl/LoggerCpp/Log.h"
+#include "fl/LoggerCpp/Channel.h"
+#include "fl/LoggerCpp/Output.h"
+#include "fl/LoggerCpp/Config.h"
 
 namespace fl {
 

fl/LoggerCpp/Output.h

@@ -10,7 +10,7 @@
  */
 #pragma once
 
-#include "LoggerCpp/Channel.h"
+#include "fl/LoggerCpp/Channel.h"
 
 #include <vector>
 #include <typeinfo>
@@ -19,7 +19,7 @@
 // or <memory> (or <tr1/memory>) when C++11 (or experimental C++0x) is available,
 // or a custom minimal shared_ptr implementation,
 // and imports the "shared_ptr" symbol inside the Log namespace (ie. Log::shared_ptr)
-#include "LoggerCpp/shared_ptr.hpp"
+#include "fl/LoggerCpp/shared_ptr.hpp"
 
 namespace fl {
 	namespace Log {

fl/LoggerCpp/OutputConsole.h

@@ -10,8 +10,8 @@
  */
 #pragma once
 
-#include "LoggerCpp/Output.h"
-#include "LoggerCpp/Config.h"
+#include "fl/LoggerCpp/Output.h"
+#include "fl/LoggerCpp/Config.h"
 
 namespace fl {
 	namespace Log {

fl/LoggerCpp/OutputDebug.h

@@ -10,8 +10,8 @@
  */
 #pragma once
 
-#include "LoggerCpp/Output.h"
-#include "LoggerCpp/Config.h"
+#include "fl/LoggerCpp/Output.h"
+#include "fl/LoggerCpp/Config.h"
 
 namespace fl {
 	namespace Log {

fl/LoggerCpp/OutputFile.h

@@ -10,8 +10,8 @@
  */
 #pragma once
 
-#include "LoggerCpp/Output.h"
-#include "LoggerCpp/Config.h"
+#include "fl/LoggerCpp/Output.h"
+#include "fl/LoggerCpp/Config.h"
 
 #include <string>
 

src/LoggerCpp/Config.cpp

@@ -9,8 +9,8 @@
  * or copy at http://opensource.org/licenses/MIT)
  */
 
-#include "LoggerCpp/Config.h"
-#include "LoggerCpp/Exception.h"
+#include "fl/LoggerCpp/Config.h"
+#include "fl/LoggerCpp/Exception.h"
 
 #include <cstdlib>
 

src/LoggerCpp/DateTime.cpp

@@ -9,8 +9,8 @@
  * or copy at http://opensource.org/licenses/MIT)
  */
 
-#include "LoggerCpp/DateTime.h"
-#include "LoggerCpp/Utils.h"
+#include "fl/LoggerCpp/DateTime.h"
+#include "fl/LoggerCpp/Utils.h"
 
 #ifdef WIN32
 #include <windows.h>

src/LoggerCpp/Log.cpp

@@ -9,8 +9,8 @@
  * or copy at http://opensource.org/licenses/MIT)
  */
 
-#include "LoggerCpp/Log.h"
-#include "LoggerCpp/Logger.h"
+#include "fl/LoggerCpp/Log.h"
+#include "fl/LoggerCpp/Logger.h"
 
 #include <cstring>
 

src/LoggerCpp/Logger.cpp

@@ -9,8 +9,8 @@
  * or copy at http://opensource.org/licenses/MIT)
  */
 
-#include "LoggerCpp/Logger.h"
-#include "LoggerCpp/Manager.h"
+#include "fl/LoggerCpp/Logger.h"
+#include "fl/LoggerCpp/Manager.h"
 
 #include <cassert>
 

src/LoggerCpp/Manager.cpp

@@ -9,11 +9,11 @@
  * or copy at http://opensource.org/licenses/MIT)
  */
 
-#include "LoggerCpp/Manager.h"
-#include "LoggerCpp/Exception.h"
+#include "fl/LoggerCpp/Manager.h"
+#include "fl/LoggerCpp/Exception.h"
 
-#include "LoggerCpp/OutputConsole.h"
-#include "LoggerCpp/OutputFile.h"
+#include "fl/LoggerCpp/OutputConsole.h"
+#include "fl/LoggerCpp/OutputFile.h"
 #ifdef WIN32
 #include "LoggerCpp/OutputDebug.h"
 #endif

src/LoggerCpp/OutputConsole.cpp

@@ -9,7 +9,7 @@
  * or copy at http://opensource.org/licenses/MIT)
  */
 
-#include "LoggerCpp/OutputConsole.h"
+#include "fl/LoggerCpp/OutputConsole.h"
 
 #include <cstdio>
 

src/LoggerCpp/OutputDebug.cpp

@@ -11,7 +11,7 @@
 
 #ifdef WIN32
 
-#include "LoggerCpp/OutputDebug.h"
+#include "fl/LoggerCpp/OutputDebug.h"
 
 #include <Windows.h>
 

src/LoggerCpp/OutputFile.cpp

@@ -9,8 +9,8 @@
  * or copy at http://opensource.org/licenses/MIT)
  */
 
-#include "LoggerCpp/OutputFile.h"
-#include "LoggerCpp/Exception.h"
+#include "fl/LoggerCpp/OutputFile.h"
+#include "fl/LoggerCpp/Exception.h"
 
 #include <cstdio>
 #include <sys/types.h>

src/main.cpp

@@ -28,7 +28,7 @@
 #include <signal.h>
 #include <fstream>
 #include <sys/time.h>
-#include "LoggerCpp/LoggerCpp.h"
+#include "fl/LoggerCpp/LoggerCpp.h"
 
 using namespace fl;