diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-09-27 10:52:51 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-09-28 19:01:15 +0100 |
| commit | c141af614729d7d96ad4acfdaabe2496465e5025 (patch) | |
| tree | 78cd84a569eed793bfb9170319d0f2e9446b0123 | |
| parent | be6ec7b22aa38c6896ac08b3490e0e9731a3077f (diff) | |
| download | dbus-c141af614729d7d96ad4acfdaabe2496465e5025.tar.gz | |
Remove EXT variable from CMake, just use Automake-compatible EXEEXT
According to Ralf, there's no standard name for this in CMake, so we
might as well use the standard Automake name.
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
| -rw-r--r-- | cmake/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake/test/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index a0f7acdc..9db47381 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -358,8 +358,8 @@ endif(X11_FOUND) # test binary names if (WIN32) - set (EXT ".exe") - # compatible with Automake .in files + # Automake calls this EXEEXT, and CMake doesn't have a standard name + # for it; follow Automake's naming convention so we can share .in files set (EXEEXT ".exe") endif(WIN32) diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt index 263a18f8..8657e4c7 100644 --- a/cmake/test/CMakeLists.txt +++ b/cmake/test/CMakeLists.txt @@ -54,7 +54,7 @@ target_link_libraries(test-names dbus-testutils) add_executable(shell-test ${shell-test_SOURCES}) target_link_libraries(shell-test ${DBUS_INTERNAL_LIBRARIES}) -ADD_TEST(shell-test ${EXECUTABLE_OUTPUT_PATH}/shell-test${EXT}) +ADD_TEST(shell-test ${EXECUTABLE_OUTPUT_PATH}/shell-test${EXEEXT}) add_executable(test-shell-service ${test-shell-service_SOURCES}) target_link_libraries(test-shell-service dbus-testutils) |