Commit 868e5b68 authored by Thomas Braun's avatar Thomas Braun
Browse files

CMakeLists.txt: Avoid adding the source directory to the include path 

This avoids tango picking up our Logging.h on case-insensitive
filesystems, where logging.h from log4tango is also in the include path.
parent da676e87

AbstractClasses/AccessControl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ 
//=============================================================================





#include <AccessControl.h>

#include <AccessControlClass.h>

#include "AccessControl.h"

#include "AccessControlClass.h"



/*----- PROTECTED REGION END -----*/	//	AccessControl.cpp

AbstractClasses/AccessControlClass.cpp

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
//=============================================================================





#include <AccessControlClass.h>

#include "AccessControlClass.h"



#include "../TangoAccessControl/Logging.h"

AbstractClasses/AccessControlClass.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
#define ACCESSCONTROLCLASS_H



#include <tango.h>

#include <AccessControl.h>

#include "AccessControl.h"



/*----- PROTECTED REGION END -----*/	//	AccessControlClass.h

AbstractClasses/AccessControlStateMachine.cpp

+2 −2
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ 






#include <AccessControl.h>

#include <AccessControlClass.h>

#include "AccessControl.h"

#include "AccessControlClass.h"



/*----- PROTECTED REGION END -----*/	//	AccessControl::AccessControlStateMachine.cpp

TangoAccessControl/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ set(ADDITIONAL_SOURCES ../AbstractClasses/AccessControl.cpp 
                       ../AbstractClasses/AccessControlClass.cpp

                       ../AbstractClasses/AccessControlStateMachine.cpp)



include_directories(${CMAKE_SOURCE_DIR} ../AbstractClasses ${TANGO_PKG_INCLUDE_DIRS} ${MYSQL_INCLUDE_DIRS})

include_directories(../AbstractClasses ${TANGO_PKG_INCLUDE_DIRS} ${MYSQL_INCLUDE_DIRS})

link_directories(${TANGO_PKG_LIBRARY_DIRS})



add_executable(TangoAccessControl ${SOURCES} ${ADDITIONAL_SOURCES})