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

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index a0f7acd..9db4738 100644 (file)
--- 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 263a18f..8657e4c 100644 (file)
--- 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)