소스 검색

ERR: Project name and executable name should match for consistency in the X11 test.

Brad King 23 년 전
부모
커밋
ccb93dc2f4
2개의 변경된 파일4개의 추가작업 그리고 12개의 파일을 삭제
  1. 1 1
      Source/CMakeLists.txt
  2. 3 11
      Tests/X11/CMakeLists.txt

+ 1 - 1
Source/CMakeLists.txt

@@ -147,7 +147,7 @@ IF(BUILD_TESTING)
     ADD_TEST(X11 ${CMake_BINARY_DIR}/Source/cmaketest 
       ${CMake_SOURCE_DIR}/Tests/X11
       ${CMake_BINARY_DIR}/Tests/X11 
-      useX11)
+      UseX11)
 
     ADD_TEST(LoadedCommand ${CMake_BINARY_DIR}/Source/cmaketest 
       ${CMake_SOURCE_DIR}/Tests/LoadCommand 

+ 3 - 11
Tests/X11/CMakeLists.txt

@@ -1,20 +1,12 @@
 # a simple C only test case
-PROJECT (X11 C)
-
-# Temporary hack to deal with dirty cache files.
-IF(EXISTS ${X11_BINARY_DIR}/X11.exe)
-  EXEC_PROGRAM(${CMAKE_COMMAND} ARGS -E remove ${X11_BINARY_DIR}/X11.exe)
-ENDIF(EXISTS ${X11_BINARY_DIR}/X11.exe)
-IF(EXISTS ${X11_BINARY_DIR}/X11)
-  EXEC_PROGRAM(${CMAKE_COMMAND} ARGS -E remove ${X11_BINARY_DIR}/X11)
-ENDIF(EXISTS ${X11_BINARY_DIR}/X11)
+PROJECT (UseX11 C)
 
 INCLUDE (${CMAKE_ROOT}/Modules/FindX11.cmake)
 
-ADD_EXECUTABLE (useX11 X11.c)
+ADD_EXECUTABLE (UseX11 X11.c)
 
 IF(CMAKE_HAS_X)
   ADD_DEFINITIONS(-DCMAKE_HAS_X)
   INCLUDE_DIRECTORIES(${CMAKE_X_INCLUDE_DIRS})
-  TARGET_LINK_LIBRARIES(useX11 ${CMAKE_X_LIBS})
+  TARGET_LINK_LIBRARIES(UseX11 ${CMAKE_X_LIBS})
 ENDIF(CMAKE_HAS_X)