On all platforms, output library to lib folder in cmake build

This commit is contained in:
baldurk
2019-01-03 12:35:38 +00:00
parent 5e269189b4
commit 14c110ce58
3 changed files with 2 additions and 5 deletions
-4
View File
@@ -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
View File
@@ -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'))
+1
View File
@@ -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()