From 6156f828e3b4d916df59c95136a13ebb2b263c54 Mon Sep 17 00:00:00 2001
From: Sebastien Barre <sebastien.barre@kitware.com>
Date: Wed, 5 Oct 2005 16:06:45 -0400
Subject: [PATCH] ENH: avoid the use of GET_TARGET_PROPERTY by testing the
CMake executable instead of the test executable
---
CMakeLists.txt | 5 +++--
testSystemTools.cxx | 8 ++++----
testSystemTools.h.in | 4 ++--
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eca7e31..ddda46d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -620,8 +620,9 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
IF(BUILD_TESTING)
- GET_TARGET_PROPERTY(TEST_SYSTEMTOOLS_EXE testSystemTools LOCATION)
- SET(TEST_SYSTEMTOOLS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/testSystemTools.cxx")
+ SET(TEST_SYSTEMTOOLS_EXE_FILE ${CMAKE_COMMAND})
+ SET(TEST_SYSTEMTOOLS_SRC_FILE
+ "${CMAKE_CURRENT_SOURCE_DIR}/testSystemTools.cxx")
CONFIGURE_FILE(
${PROJECT_SOURCE_DIR}/testSystemTools.h.in
${PROJECT_BINARY_DIR}/testSystemTools.h)
diff --git a/testSystemTools.cxx b/testSystemTools.cxx
index cf16c0e..d906bc4 100644
--- a/testSystemTools.cxx
+++ b/testSystemTools.cxx
@@ -97,21 +97,21 @@ bool CheckDetectFileType()
{
bool res = true;
- if (kwsys::SystemTools::DetectFileType(TEST_SYSTEMTOOLS_EXE) !=
+ if (kwsys::SystemTools::DetectFileType(TEST_SYSTEMTOOLS_EXE_FILE) !=
kwsys::SystemTools::FileTypeBinary)
{
kwsys_ios::cerr
<< "Problem with DetectFileType - failed to detect type of: "
- << TEST_SYSTEMTOOLS_EXE << kwsys_ios::endl;
+ << TEST_SYSTEMTOOLS_EXE_FILE << kwsys_ios::endl;
res = false;
}
- if (kwsys::SystemTools::DetectFileType(TEST_SYSTEMTOOLS_SRC) !=
+ if (kwsys::SystemTools::DetectFileType(TEST_SYSTEMTOOLS_SRC_FILE) !=
kwsys::SystemTools::FileTypeText)
{
kwsys_ios::cerr
<< "Problem with DetectFileType - failed to detect type of: "
- << TEST_SYSTEMTOOLS_SRC << kwsys_ios::endl;
+ << TEST_SYSTEMTOOLS_SRC_FILE << kwsys_ios::endl;
res = false;
}
diff --git a/testSystemTools.h.in b/testSystemTools.h.in
index ae2d79b..c43097b 100644
--- a/testSystemTools.h.in
+++ b/testSystemTools.h.in
@@ -14,7 +14,7 @@
#ifndef @KWSYS_NAMESPACE@_testSystemtools_h
#define @KWSYS_NAMESPACE@_testSystemtools_h
-#define TEST_SYSTEMTOOLS_EXE "@TEST_SYSTEMTOOLS_EXE@"
-#define TEST_SYSTEMTOOLS_SRC "@TEST_SYSTEMTOOLS_SRC@"
+#define TEST_SYSTEMTOOLS_EXE_FILE "@TEST_SYSTEMTOOLS_EXE_FILE@"
+#define TEST_SYSTEMTOOLS_SRC_FILE "@TEST_SYSTEMTOOLS_SRC_FILE@"
#endif
--
GitLab