fix setting of CMAKE_INCLUDE_PATH

libyui · Jun 16, 2012 · 800a9c0 · 800a9c0
1 parent 6a24b15
commit 800a9c0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/src" "${CMAKE_INCLUDE_PATH}" )
+INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/src" ${CMAKE_INCLUDE_PATH} )
 
 FOREACH( EXAMPLE ${EXAMPLES_LIST} )
   IF( ENABLE_EXAMPLES )

diff --git a/macros.cmake b/macros.cmake
@@ -155,8 +155,8 @@ MACRO( FIND_LIB_DEPENDENCIES )	# try to find all libs from ${LIB_DEPS}
 
   FOREACH( p ${LIB_DEPS} )
     FIND_PACKAGE( ${p} REQUIRED )
-    SET( CMAKE_INCLUDE_PATH "${${p}_INCLUDE_DIR}" "${CMAKE_INCLUDE_PATH}" )
-    SET( CMAKE_INCLUDE_PATH "${${p}_INCLUDE_DIRS}" "${CMAKE_INCLUDE_PATH}" )
+    SET( CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH}" ${${p}_INCLUDE_DIR} )
+    SET( CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH}" ${${p}_INCLUDE_DIRS} )
     SET( LIB_LINKER "${${p}_LIBRARIES}" "${LIB_LINKER}" )
   ENDFOREACH()
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_INCLUDE_PATH}" )
+INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" ${CMAKE_INCLUDE_PATH} )
 
 IF( QT_FOUND )