浏览代码

ENH: CMake kills me (so does Cygwin)

Sebastien Barre 20 年之前
父节点
当前提交
07b45da693
共有 4 个文件被更改,包括 5 次插入4 次删除
  1. 2 1
      Source/kwsys/CMakeLists.txt
  2. 二进制
      Source/kwsys/testSystemTools.bin
  3. 2 2
      Source/kwsys/testSystemTools.cxx
  4. 1 1
      Source/kwsys/testSystemTools.h.in

+ 2 - 1
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(

二进制
Source/kwsys/testSystemTools.bin


+ 2 - 2
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;
     }
 

+ 1 - 1
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