On 07.05.2011 11:48, Peter Kümmel wrote:
On 07.05.2011 11:37, Peter Kümmel wrote:
On 07.05.2011 11:07, Kornel wrote:
Am Samstag, 7. Mai 2011 schrieb Kornel:
That is exactly, what I am doing Peter.
This is the patch.
Kornel
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
-set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/build/bin)
+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/build/lib)
When building out-of-source in 'build' we would have
'build/build/bin'. Couldn't we detect if we be in-source
and use different build pathes then:
if(IN_SOURCE_BUILD)
set(LYX_OUTPUT_PATH ${CMAKE_BINARY_DIR}/build)
else()
set(LYX_OUTPUT_PATH ${CMAKE_BINARY_DIR}/)
endif()
set(EXECUTABLE_OUTPUT_PATH ${LYX_OUTPUT_PATH}/build/bin)
set(LIBRARY_OUTPUT_PATH ${LYX_OUTPUT_PATH}/build/lib)
if(${TOP_SRC_DIR} MATCHES ${CMAKE_BINARY_DIR})
message(STATUS "Building in-source")
else()
message(STATUS "Building out-of-source")
endif()
I'm updating the patch.
https://github.com/syntheticpp/lyx/commit/74582fad3e497a5fb802a76cc8fc2da3d36af00f
And just remove the old code, no need
to keep it by only commenting out.
Peter
