diff --git a/CMakeExternals/PCRE.cmake b/CMakeExternals/PCRE.cmake
index 69dcca017c..fbb87ff434 100644
--- a/CMakeExternals/PCRE.cmake
+++ b/CMakeExternals/PCRE.cmake
@@ -1,36 +1,36 @@
 #--------------------------------------------------------------------------
 #  PCRE (Perl Compatible Regular Expressions)
 #--------------------------------------------------------------------------
 if(MITK_USE_PCRE)
   if(DEFINED PCRE_DIR AND NOT EXISTS ${PCRE_DIR})
       message(FATAL_ERROR "PCRE_DIR variable is defined but corresponds to non-existing directory")
    endif()
   if(NOT PCRE_DIR)
 
     set(proj PCRE)
     set(${proj}_DEPENDENCIES "")
     set(PCRE_TARGET_VERSION 8.35)
     set(PCRE_DOWNLOAD_SOURCE_HASH "ed58bcbe54d3b1d59e9f5415ef45ce1c")
 
     ExternalProject_add(${proj}
       URL http://midas3.kitware.com/midas/api/rest?method=midas.bitstream.download&checksum=${PCRE_DOWNLOAD_SOURCE_HASH}&name=pcre-${PCRE_TARGET_VERSION}.tar.gz
       URL_MD5 "${PCRE_DOWNLOAD_SOURCE_HASH}"
       SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-src
       BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build
       INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-install
       PREFIX ${proj}-cmake
-      CONFIGURE_COMMAND CC=${CMAKE_C_COMPILER}${CMAKE_C_COMPILER_ARG1}
+      CONFIGURE_COMMAND <SOURCE_DIR>/./configure
+                        CC=${CMAKE_C_COMPILER}${CMAKE_C_COMPILER_ARG1}
                         LDFLAGS=${CMAKE_LINKER_FLAGS} ${CMAKE_LINKER_FLAGS_RELEASE}
                         CXX=${CMAKE_CXX_COMPILER}${CMAKE_CXX_COMPILER_ARG1}
-                        <SOURCE_DIR>/./configure
                         --prefix=<INSTALL_DIR>
                         --disable-shared
       DEPENDS "${${proj}_DEPENDENCIES}"
       )
 
     set(PCRE_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-install)
 
   else()
     mitkMacroEmptyExternalProject(${proj} "${${proj}_DEPENDENCIES}")
   endif()
 endif()
diff --git a/CMakeExternals/Swig.cmake b/CMakeExternals/Swig.cmake
index 80db520e1a..0f2174539a 100644
--- a/CMakeExternals/Swig.cmake
+++ b/CMakeExternals/Swig.cmake
@@ -1,65 +1,64 @@
 #------------------------------------------------------------
 # SWIG (Simple Wrapper Interface Generator)
 #-----------------------------------------------------------
 if(MITK_USE_SWIG)
   if(DEFINED Swig_DIR AND NOT EXISTS ${Swig_DIR})
     message(FATAL_ERROR "Swig_DIR variable is defined but corresponds to non-existing directory")
   endif()
 
   if(NOT SWIG_DIR)
     set(SWIG_TARGET_VERSION 3.0.2)
     set(proj Swig)
     set(Swig_DEPENDENCIES )
     set(Swig_DEPENDS )
 
     # binary SWIG for windows
     if(WIN32)
       set(swig_source_dir ${CMAKE_CURRENT_BINARY_DIR}/swigwin-${SWIG_TARGET_VERSION})
 
       # swig.exe available as pre-built binary on Windows:
       ExternalProject_Add(Swig
         URL https://dl.dropboxusercontent.com/u/8367205/ExternalProjects/swigwin-${SWIG_TARGET_VERSION}.zip
         URL_MD5 "3f18de4fc09ab9abb0d3be37c11fbc8f"
         SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/swigwin-${SWIG_TARGET_VERSION}
         CONFIGURE_COMMAND ""
         BUILD_COMMAND ""
         INSTALL_COMMAND ""
         )
 
       set(SWIG_DIR ${CMAKE_CURRENT_BINARY_DIR}/swigwin-${SWIG_TARGET_VERSION}) # path specified as source in ep
       set(SWIG_EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/swigwin-${SWIG_TARGET_VERSION}/swig.exe)
 
     else()
 
       list(APPEND Swig_DEPENDENCIES PCRE)
 
       # swig uses bison find it by cmake and pass it down
       find_package(BISON)
       set(BISON_FLAGS "" CACHE STRING "Flags used by bison")
       mark_as_advanced( BISON_FLAGS)
 
       ExternalProject_add(${proj}
         URL https://dl.dropboxusercontent.com/u/8367205/ExternalProjects/swig-${SWIG_TARGET_VERSION}.tar.gz
         URL_MD5 "62f9b0d010cef36a13a010dc530d0d41"
         SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-src
         BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build
         INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-install
         PREFIX ${proj}-cmake
-        CONFIGURE_COMMAND CC=${CMAKE_C_COMPILER}${CMAKE_C_COMPILER_ARG1}
+        CONFIGURE_COMMAND <SOURCE_DIR>/./configure
+                          CC=${CMAKE_C_COMPILER}${CMAKE_C_COMPILER_ARG1}
                           LDFLAGS=${CMAKE_LINKER_FLAGS} ${CMAKE_LINKER_FLAGS_RELEASE}
                           CXX=${CMAKE_CXX_COMPILER}${CMAKE_CXX_COMPILER_ARG1}
-                          YACC=${BISON_EXECUTABLE}
-                          <SOURCE_DIR>/./configure
                             --prefix=<INSTALL_DIR>
                             --with-pcre-prefix=${PCRE_DIR}
                             --without-octave
                             --with-python=${PYTHON_EXECUTABLE}
         DEPENDS ${Swig_DEPENDENCIES}
         )
 
       set(SWIG_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-install/share/swig/${SWIG_TARGET_VERSION})
       set(SWIG_EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/${proj}-install/bin/swig)
 
     endif()
   endif(NOT SWIG_DIR)
 endif()