From 14c110ce58cf112b705bd56fb3d2af5f15a03673 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 3 Jan 2019 12:35:38 +0000
Subject: [PATCH] On all platforms, output library to lib folder in cmake build

---
 CMakeLists.txt           | 4 ----
 docs/conf.py             | 2 +-
 renderdoc/CMakeLists.txt | 1 +
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f486dcd62..0c1200dc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -165,11 +165,7 @@ if(ANDROID)
     message(STATUS "Using Android native API level ${ANDROID_NATIVE_API_LEVEL}")
 endif()
 
-if(APPLE)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
-else()
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-endif()
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 if(ENABLE_GL)
diff --git a/docs/conf.py b/docs/conf.py
index 7f1a3217e..354acd3e7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -39,7 +39,7 @@ os.environ["PATH"] += os.pathsep + os.path.abspath(binpath + 'Development/')
 os.environ["PATH"] += os.pathsep + os.path.abspath(binpath + 'Release/')
 
 # path to module libraries for linux
-sys.path.insert(0, os.path.abspath('../build/bin'))
+sys.path.insert(0, os.path.abspath('../build/lib'))
 
 sys.path.insert(0, os.path.abspath('sphinx_exts'))
 
diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
index caac29941..4b5da789c 100644
--- a/renderdoc/CMakeLists.txt
+++ b/renderdoc/CMakeLists.txt
@@ -358,6 +358,7 @@ if(UNIX)
 
         add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+            COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
             COMMAND ${HOST_NATIVE_CPP_COMPILER} 3rdparty/include-bin/main.cpp -o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
             DEPENDS 3rdparty/include-bin/main.cpp)
     else()