mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-05-04 17:10:47 +00:00
On all platforms, output library to lib folder in cmake build
This commit is contained in:
@@ -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)
|
||||
|
||||
+1
-1
@@ -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'))
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user