kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brad King 2002-12-18 09:38:34 -05:00
parent 10931b5e66
commit ccb93dc2f4
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CMakeLists.txt
View File

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

14
Tests/X11/CMakeLists.txt
View File

@ -1,20 +1,12 @@
# a simple C only test case # a simple C only test case
PROJECT (X11 C) PROJECT (UseX11 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)
INCLUDE (${CMAKE_ROOT}/Modules/FindX11.cmake) INCLUDE (${CMAKE_ROOT}/Modules/FindX11.cmake)
ADD_EXECUTABLE (useX11 X11.c) ADD_EXECUTABLE (UseX11 X11.c)
IF(CMAKE_HAS_X) IF(CMAKE_HAS_X)
ADD_DEFINITIONS(-DCMAKE_HAS_X) ADD_DEFINITIONS(-DCMAKE_HAS_X)
INCLUDE_DIRECTORIES(${CMAKE_X_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${CMAKE_X_INCLUDE_DIRS})
TARGET_LINK_LIBRARIES(useX11 ${CMAKE_X_LIBS}) TARGET_LINK_LIBRARIES(UseX11 ${CMAKE_X_LIBS})
ENDIF(CMAKE_HAS_X) ENDIF(CMAKE_HAS_X)