From 1a7c0831be55d176e7a5e256e7a6509896de4753 Mon Sep 17 00:00:00 2001 From: eidheim Date: Fri, 4 Dec 2015 14:12:43 +0100 Subject: [PATCH] Renamed MSYS2_PROCESS_USE_SH to MSYS_PROCESS_USE_SH --- src/CMakeLists.txt | 2 +- src/process_win.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 67eeecc..3fb34c1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -22,7 +22,7 @@ if(UNIX) #Checking if compiling on Ubuntu that has a buggy menu system endif() if(MSYS) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMSYS2_PROCESS_USE_SH -DJUCI_CMAKE_INSTALL_PREFIX=\\\"${CMAKE_INSTALL_PREFIX}\\\"") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMSYS_PROCESS_USE_SH -DJUCI_CMAKE_INSTALL_PREFIX=\\\"${CMAKE_INSTALL_PREFIX}\\\"") endif() INCLUDE(FindPkgConfig) diff --git a/src/process_win.cc b/src/process_win.cc index 771c377..a4cc727 100644 --- a/src/process_win.cc +++ b/src/process_win.cc @@ -93,7 +93,7 @@ process_id_type Process::open(const std::string &command, const std::string &pat } char* command_cstr; -#ifdef MSYS2_PROCESS_USE_SH +#ifdef MSYS_PROCESS_USE_SH size_t pos=0; std::string sh_command=command; while((pos=sh_command.find('\"', pos))!=std::string::npos) {