From 2d2fd512ccf4a5076e8862633de06378574e6385 Mon Sep 17 00:00:00 2001 From: Benjamin Bihler Date: Thu, 6 Feb 2014 14:56:14 +0100 Subject: [PATCH 1/2] Made library output path absolute when using MinGw --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bacf1ab82..c228499880 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -863,7 +863,7 @@ if(WIN32) IF (MINGW) message(STATUS "Found MINGW compiler: ${MINGW}") endif(MINGW) - set(LIBRARY_OUTPUT_PATH win${BIT}/bin/${CMAKE_BUILD_TYPE}) + set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/win${BIT}/bin/${CMAKE_BUILD_TYPE}) endif() set(EXECUTABLE_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH}) else(WIN32) From 9cd80ae6ca5e9a79b309b62b4d6fa3f2a47f58c2 Mon Sep 17 00:00:00 2001 From: Benjamin Bihler Date: Fri, 7 Feb 2014 16:14:23 +0100 Subject: [PATCH 2/2] Removed unnecessary elseif branch --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c228499880..20f5d7961e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -857,8 +857,6 @@ if(WIN32) if(MSVC) # The compiler used is MSVC message(STATUS "Found MSVC compiler: ${MSVC} ${MSVC_VERSION}") set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin/) - elseif (BORLAND) # The compiler used is BORLAND - set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/win${BIT}/bin/${CMAKE_BUILD_TYPE}) else() IF (MINGW) message(STATUS "Found MINGW compiler: ${MINGW}")