From 6509d4fe285580dd95c2a953cccc3cb095902937 Mon Sep 17 00:00:00 2001 From: Erwin Janssen Date: Thu, 5 Jan 2017 10:07:48 +0100 Subject: [PATCH] Replace "." with "${CMAKE_CURRENT_SOURCE_DIR}" When specifying the current source directory as an include directory, both "." and "${CMAKE_CURRENT_SOURCE_DIR}" mean the same, but the latter is more descriptive. --- lib/cdt/CMakeLists.txt | 2 +- lib/cgraph/CMakeLists.txt | 4 ++-- lib/circogen/CMakeLists.txt | 2 +- lib/dotgen/CMakeLists.txt | 2 +- lib/patchwork/CMakeLists.txt | 2 +- lib/pathplan/CMakeLists.txt | 2 +- lib/twopigen/CMakeLists.txt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/cdt/CMakeLists.txt b/lib/cdt/CMakeLists.txt index 59b862e45..22fe43b19 100644 --- a/lib/cdt/CMakeLists.txt +++ b/lib/cdt/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions(-D_BLD_cdt) -include_directories(.) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) add_library(cdt SHARED # Header files diff --git a/lib/cgraph/CMakeLists.txt b/lib/cgraph/CMakeLists.txt index 3565bc4ea..2e4ad2e3f 100644 --- a/lib/cgraph/CMakeLists.txt +++ b/lib/cgraph/CMakeLists.txt @@ -32,9 +32,9 @@ add_custom_command( add_definitions(-DCGRAPH_EXPORTS -DYY_NO_UNISTD_H) include_directories( - . - ${GRAPHVIZ_LIB_DIR}/cdt + ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} + ${GRAPHVIZ_LIB_DIR}/cdt ) add_library(cgraph SHARED diff --git a/lib/circogen/CMakeLists.txt b/lib/circogen/CMakeLists.txt index 2841c0643..9f501779f 100644 --- a/lib/circogen/CMakeLists.txt +++ b/lib/circogen/CMakeLists.txt @@ -1,5 +1,5 @@ include_directories( - . + ${CMAKE_CURRENT_SOURCE_DIR} ${GRAPHVIZ_LIB_DIR}/cdt ${GRAPHVIZ_LIB_DIR}/cgraph ${GRAPHVIZ_LIB_DIR}/common diff --git a/lib/dotgen/CMakeLists.txt b/lib/dotgen/CMakeLists.txt index b135af9ab..1cd1ae4fe 100644 --- a/lib/dotgen/CMakeLists.txt +++ b/lib/dotgen/CMakeLists.txt @@ -1,5 +1,5 @@ include_directories( - . + ${CMAKE_CURRENT_SOURCE_DIR} ${GRAPHVIZ_LIB_DIR}/cdt ${GRAPHVIZ_LIB_DIR}/cgraph ${GRAPHVIZ_LIB_DIR}/common diff --git a/lib/patchwork/CMakeLists.txt b/lib/patchwork/CMakeLists.txt index be587bf04..3e1b5fbe5 100644 --- a/lib/patchwork/CMakeLists.txt +++ b/lib/patchwork/CMakeLists.txt @@ -1,5 +1,5 @@ include_directories( - . + ${CMAKE_CURRENT_SOURCE_DIR} ${GRAPHVIZ_LIB_DIR}/cdt ${GRAPHVIZ_LIB_DIR}/cgraph ${GRAPHVIZ_LIB_DIR}/common diff --git a/lib/pathplan/CMakeLists.txt b/lib/pathplan/CMakeLists.txt index 2eec7c418..6c0e8b552 100644 --- a/lib/pathplan/CMakeLists.txt +++ b/lib/pathplan/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions(-D_BLD_pathplan -DPATHPLAN_EXPORTS) -include_directories(.) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) add_library(pathplan SHARED # Header files diff --git a/lib/twopigen/CMakeLists.txt b/lib/twopigen/CMakeLists.txt index c6d4046be..a6f58c40b 100644 --- a/lib/twopigen/CMakeLists.txt +++ b/lib/twopigen/CMakeLists.txt @@ -1,5 +1,5 @@ include_directories( - . + ${CMAKE_CURRENT_SOURCE_DIR} ${GRAPHVIZ_LIB_DIR}/cdt ${GRAPHVIZ_LIB_DIR}/cgraph ${GRAPHVIZ_LIB_DIR}/common -- 2.40.0