diff options
| -rw-r--r-- | Source/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/X11/CMakeLists.txt | 14 |
2 files changed, 4 insertions, 12 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 674d61c..358442d 100644 --- a/Source/CMakeLists.txt +++ b/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 diff --git a/Tests/X11/CMakeLists.txt b/Tests/X11/CMakeLists.txt index 6a4abef..59711b0 100644 --- a/Tests/X11/CMakeLists.txt +++ b/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) |