From 07b45da69356a3cd0e1b7ed136449c38a9d82c69 Mon Sep 17 00:00:00 2001 From: Sebastien Barre Date: Thu, 6 Oct 2005 17:16:07 -0400 Subject: [PATCH] ENH: CMake kills me (so does Cygwin) --- Source/kwsys/CMakeLists.txt | 3 ++- Source/kwsys/testSystemTools.bin | Bin 0 -> 766 bytes Source/kwsys/testSystemTools.cxx | 4 ++-- Source/kwsys/testSystemTools.h.in | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 Source/kwsys/testSystemTools.bin diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index 51066b5b4..c0b4f6676 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -620,7 +620,8 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) IF(BUILD_TESTING) - SET(TEST_SYSTEMTOOLS_EXE_FILE ${CMAKE_COMMAND}) + SET(TEST_SYSTEMTOOLS_BIN_FILE + "${CMAKE_CURRENT_SOURCE_DIR}/testSystemTools.bin") SET(TEST_SYSTEMTOOLS_SRC_FILE "${CMAKE_CURRENT_SOURCE_DIR}/testSystemTools.cxx") CONFIGURE_FILE( diff --git a/Source/kwsys/testSystemTools.bin b/Source/kwsys/testSystemTools.bin new file mode 100644 index 0000000000000000000000000000000000000000..961a4043b9b2785351ab26a33cfcb1f366c1391b GIT binary patch literal 766 zcmbV~J8r`;5JX3D078KQr%G#;xrK8icPgzTq*cc{r`QAV5H3@?bYXZsLq;FVX_BRe z%g5!cJ`hlGG|ej%-%r3B^E=g0A5?{B&Opc7@6oZyO4pUdnM;@%vkIOsxNAjmXiL+d z<7 zAIM?AiVDY~%?XgU=c3&OkPg?P^8282@1&KxNx}UnZQM`N*8ME)+%M9>{YuT^22-rR A-v9sr literal 0 HcmV?d00001 diff --git a/Source/kwsys/testSystemTools.cxx b/Source/kwsys/testSystemTools.cxx index 9ccec3df7..55682f44f 100644 --- a/Source/kwsys/testSystemTools.cxx +++ b/Source/kwsys/testSystemTools.cxx @@ -97,12 +97,12 @@ bool CheckDetectFileType() { bool res = true; - if (kwsys::SystemTools::DetectFileType(TEST_SYSTEMTOOLS_EXE_FILE) != + if (kwsys::SystemTools::DetectFileType(TEST_SYSTEMTOOLS_BIN_FILE) != kwsys::SystemTools::FileTypeBinary) { kwsys_ios::cerr << "Problem with DetectFileType - failed to detect type of: " - << TEST_SYSTEMTOOLS_EXE_FILE << kwsys_ios::endl; + << TEST_SYSTEMTOOLS_BIN_FILE << kwsys_ios::endl; res = false; } diff --git a/Source/kwsys/testSystemTools.h.in b/Source/kwsys/testSystemTools.h.in index 3e63a43e9..5fefd10b7 100644 --- a/Source/kwsys/testSystemTools.h.in +++ b/Source/kwsys/testSystemTools.h.in @@ -14,7 +14,7 @@ #ifndef @KWSYS_NAMESPACE@_testSystemtools_h #define @KWSYS_NAMESPACE@_testSystemtools_h -#define TEST_SYSTEMTOOLS_EXE_FILE "@TEST_SYSTEMTOOLS_EXE_FILE@" +#define TEST_SYSTEMTOOLS_BIN_FILE "@TEST_SYSTEMTOOLS_BIN_FILE@" #define TEST_SYSTEMTOOLS_SRC_FILE "@TEST_SYSTEMTOOLS_SRC_FILE@" #endif