From d4e8e7d223b25fc5ebb8713381cc3ee5559bdc7e Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 20 Jun 2003 14:10:28 -0400
Subject: [PATCH] ENH: Changed configuration of header directory to specify it
without the namespace.
---
CMakeLists.txt | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f3ca5e..eb3b5d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,11 +29,13 @@
#
# Optional settings are as follows:
#
-# KWSYS_HEADER_DIR = The directory into which to generate the kwsys headers.
+# KWSYS_HEADER_ROOT = The directory into which to generate the kwsys headers.
+# A directory called "${KWSYS_NAMESPACE}" will be
+# created under this root directory to hold the files.
#
# Example:
#
-# SET(KWSYS_HEADER_DIR ${CMAKE_CURRENT_BINARY_DIR}/${KWSYS_NAMESPACE})
+# SET(KWSYS_HEADER_ROOT ${CMAKE_CURRENT_BINARY_DIR})
# INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
#
# KWSYS_LIBRARY_INSTALL_DIR = The installation target directories into
@@ -141,9 +143,10 @@ SET(KWSYS_NO_ANSI_STRING_STREAM ${CMAKE_NO_ANSI_STRING_STREAM})
#-----------------------------------------------------------------------------
# Choose a directory for the generated headers.
-IF(NOT KWSYS_HEADER_DIR)
- SET(KWSYS_HEADER_DIR "${PROJECT_BINARY_DIR}/${KWSYS_NAMESPACE}")
-ENDIF(NOT KWSYS_HEADER_DIR)
+IF(NOT KWSYS_HEADER_ROOT)
+ SET(KWSYS_HEADER_ROOT "${PROJECT_BINARY_DIR}")
+ENDIF(NOT KWSYS_HEADER_ROOT)
+SET(KWSYS_HEADER_DIR "${KWSYS_HEADER_ROOT}/${KWSYS_NAMESPACE}")
#-----------------------------------------------------------------------------
# Create STL header wrappers to block warnings in the STL headers and
@@ -334,7 +337,7 @@ ENDIF(KWSYS_USE_Process)
#-----------------------------------------------------------------------------
# Setup testing if not being built as part of another project.
IF(KWSYS_STANDALONE)
- INCLUDE_DIRECTORIES(${KWSYS_HEADER_DIR}/..)
+ INCLUDE_DIRECTORIES(${KWSYS_HEADER_ROOT})
ADD_EXECUTABLE(testProcess testProcess.c)
ADD_EXECUTABLE(test1 test1.cxx)
TARGET_LINK_LIBRARIES(testProcess ${KWSYS_NAMESPACE})
--
GitLab