AtteT

Index: src/main/java/hudson/plugins/cmake/CmakeBuilder.java
===================================================================
--- src/main/java/hudson/plugins/cmake/CmakeBuilder.java        (revision 29985)
+++ src/main/java/hudson/plugins/cmake/CmakeBuilder.java        (working copy)
@@ -160,21 +160,21 @@
        listener.getLogger().println("CMake call : " + cmakeCall);

        try {
-               int result = launcher.launch(cmakeCall, new HashMap<String, String>(),
+               int result = launcher.launch(cmakeCall, envs,
                                listener.getLogger(), new FilePath(workSpace, theBuildDir)).join();
                if (result != 0) {
                        return false;
                }

                if (!getMakeCommand().trim().isEmpty()) {
-                       result = launcher.launch(getMakeCommand(), new HashMap<String, String>(),
+                       result = launcher.launch(getMakeCommand(), envs,
                                        listener.getLogger(), new FilePath(workSpace, theBuildDir)).join();
                        if (result != 0) {
                                return false;
                        }
                }
                if (!getInstallCommand().trim().isEmpty()) {
-                       result = launcher.launch(getInstallCommand(), new HashMap<String, String>(),
+                       result = launcher.launch(getInstallCommand(), envs,
                                        listener.getLogger(), new FilePath(workSpace, theBuildDir)).join();
                }
                return (result == 0);
Index: src/main/resources/hudson/plugins/cmake/CmakeBuilder/config.jelly
===================================================================
--- src/main/resources/hudson/plugins/cmake/CmakeBuilder/config.jelly   (revision 29985)
+++ src/main/resources/hudson/plugins/cmake/CmakeBuilder/config.jelly   (working copy)
@@ -14,10 +14,9 @@

        <f:entry name="buildType" title="Build Type" field="buildType">
                <select name="buildType">
-                       <option value="Debug">Debug</option>
-                       <option value="Release">Release</option>
-                       <option value="RelWithDebInfo">RelWithDebInfo</option>
-                       <option value="MinSizeRel">MinSizeRel</option>
+                       <j:forEach var="type" items="Debug, Release, RelWithDebInfo, MinSizeRel">
+                       <f:option selected="${type==instance.getBuildType()}" value="${type}">${type}</f:option>
+                       </j:forEach>
                </select>
        </f:entry>