1.1 --- a/utils.cmake	Fri Jun 15 03:10:57 2012 +0200
     1.2 +++ b/utils.cmake	Tue Jun 10 14:32:02 2014 +0200
     1.3 @@ -126,15 +126,16 @@
     1.4  #Use those include path macro instead of cmake built-in include_directories as it allows us to set include directories per target instead of per directory.
     1.5  macro(system_include path)
     1.6  	get_target(targetName)
     1.7 -	get_target_property(value ${targetName} COMPILE_FLAGS)
     1.8 -	#MS CL compiler specific. I guess gcc should use -I instead of /I
     1.9 -	if (${value} STREQUAL "value-NOTFOUND")
    1.10 -		set(value "/I ${PROJECT_SOURCE_DIR}${path}")		
    1.11 -	else (${value} STREQUAL "value-NOTFOUND")
    1.12 -		set(value "${value} /I ${PROJECT_SOURCE_DIR}${path}")		
    1.13 -	endif (${value} STREQUAL "value-NOTFOUND")
    1.14 +	#get_target_property(value ${targetName} COMPILE_FLAGS)
    1.15 +	##MS CL compiler specific. I guess gcc should use -I instead of /I
    1.16 +	#if (${value} STREQUAL "value-NOTFOUND")
    1.17 +	#	set(value "/I ${PROJECT_SOURCE_DIR}${path}")		
    1.18 +	#else (${value} STREQUAL "value-NOTFOUND")
    1.19 +	#	set(value "${value} /I ${PROJECT_SOURCE_DIR}${path}")		
    1.20 +	#endif (${value} STREQUAL "value-NOTFOUND")
    1.21  	#message("Add system include: ${value}")	
    1.22 -	set_target_properties(${targetName} PROPERTIES COMPILE_FLAGS "${value}")	
    1.23 +	#set_target_properties(${targetName} PROPERTIES COMPILE_FLAGS "${value}")
    1.24 +	set_property(TARGET ${targetName} APPEND PROPERTY INCLUDE_DIRECTORIES ${PROJECT_SOURCE_DIR}${path})
    1.25  endmacro(system_include)
    1.26  
    1.27  #-----------------------------------------------------
    1.28 @@ -143,14 +144,15 @@
    1.29  #TODO: Is this working with releative path?
    1.30  macro(user_include path)
    1.31  	get_target(targetName)
    1.32 -	get_target_property(value ${targetName} COMPILE_FLAGS)
    1.33 -	#MS CL compiler specific. I guess gcc should use -I instead of /I
    1.34 -	if (${value} STREQUAL "value-NOTFOUND")
    1.35 -		set(value "/I ${CMAKE_CURRENT_LIST_DIR}/${path}")	
    1.36 -	else (${value} STREQUAL "value-NOTFOUND")
    1.37 -		set(value "${value} /I ${CMAKE_CURRENT_LIST_DIR}/${path}")	
    1.38 -	endif (${value} STREQUAL "value-NOTFOUND")	
    1.39 -	set_target_properties(${targetName} PROPERTIES COMPILE_FLAGS "${value}")
    1.40 +	#get_target_property(value ${targetName} COMPILE_FLAGS)
    1.41 +	##MS CL compiler specific. I guess gcc should use -I instead of /I
    1.42 +	#if (${value} STREQUAL "value-NOTFOUND")
    1.43 +	#	set(value "/I ${CMAKE_CURRENT_LIST_DIR}/${path}")	
    1.44 +	#else (${value} STREQUAL "value-NOTFOUND")
    1.45 +	#	set(value "${value} /I ${CMAKE_CURRENT_LIST_DIR}/${path}")	
    1.46 +	#endif (${value} STREQUAL "value-NOTFOUND")	
    1.47 +	#set_target_properties(${targetName} PROPERTIES COMPILE_FLAGS "${value}")
    1.48 +	set_property(TARGET ${targetName} APPEND PROPERTY INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/${path})
    1.49  endmacro(user_include)
    1.50  
    1.51