Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 00:05:17 +03:00
Code Issues Wiki Activity

Companion binaries and libs built into the same directory

Browse source
This commit is contained in:
Bertrand Songis 2015-12-23 22:28:54 +01:00
parent 97d59cfa56
commit 1e15b711bb
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
companion/src/CMakeLists.txt
View file

@ -1,5 +1,8 @@
include(Macros) include(Macros)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/companion)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/companion)
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(C9X_NAME_SUFFIX ${VERSION_MAJOR}${VERSION_MINOR}) set(C9X_NAME_SUFFIX ${VERSION_MAJOR}${VERSION_MINOR})
set(COMPANION_NAME "companion${C9X_NAME_SUFFIX}") set(COMPANION_NAME "companion${C9X_NAME_SUFFIX}")

3
companion/src/firmwares/opentx/simulator/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
today(DATE) today(DATE)
now(TIME) now(TIME)
git_id(GIT_STR) git_id(GIT_STR)