Merge pull request #475 from tpaviot/review/mingw64compilation

Made library output path absolute when using MinGw
tpaviot · Feb 9, 2014 · aded097 · aded097
2 parents 0f4fe7e + 9cd80ae
commit aded097
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -857,13 +857,11 @@ 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}")
 		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)