diff --git a/CMakeLists.txt b/CMakeLists.txt index eca7e3198cb8014239cdba6e483cf9dc8e169015..ddda46d50bc8d23c2269eec953a13185bed621d1 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 cf16c0ebacb7ca77dc2ac42c031177c3b27bd49e..d906bc4a4dc00449968a728e0ebe26959aed0d93 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 ae2d79b06d8dca6250f5c0514f2e8f98b2327bb8..c43097bae233bfbb627c25b2c13b294d70767642 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