Attachment 51655 Details for Bug 41222 – [6] Remove EXT variable from CMake, just use Automake-compatible EXEEXT

[patch] [6] Remove EXT variable from CMake, just use Automake-compatible EXEEXT

0001-Remove-EXT-variable-from-CMake-just-use-Automake-com.patch (text/plain), 1.55 KB, created by Simon McVittie on 2011-09-27 02:53:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-09-27 02:53:33 UTC

Size: 1.55 KB

patch

obsolete

>From 6047cab5f8c38d0080d48a924be73ff3e64a4e0e Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 27 Sep 2011 10:52:51 +0100
>Subject: [PATCH] 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.
>---
> cmake/CMakeLists.txt      |    4 ++--
> cmake/test/CMakeLists.txt |    2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
>index 8a93f71..00fda0d 100644
>--- a/cmake/CMakeLists.txt
>+++ b/cmake/CMakeLists.txt
>@@ -359,8 +359,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 dd50044..0ca863c 100644
>--- a/cmake/test/CMakeLists.txt
>+++ b/cmake/test/CMakeLists.txt
>@@ -60,7 +60,7 @@ target_link_libraries(test-names ${DBUS_INTERNAL_LIBRARIES})
> 
> 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_INTERNAL_LIBRARIES})
>-- 
>1.7.6.3
>

Actions: View | Splinter Review

Attachments on bug 41222: 51632 | 51633 | 51634 | 51636 | 51637 | 51655

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.