all: Ensure editable mode works for all packages

eclipse · Jan 7, 2021 · 2b5cf81 · 2b5cf81
1 parent 77a135a
commit 2b5cf81
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 23 deletions.
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
@@ -76,6 +76,7 @@ add_executable(${target}
 set_target_properties(${target} PROPERTIES
     CXX_STANDARD 14
     CXX_STANDARD_REQUIRED ON
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin
     OUTPUT_NAME ${output}
 )
 target_compile_definitions(${target}

diff --git a/models/CMakeLists.txt b/models/CMakeLists.txt
@@ -23,9 +23,12 @@ add_library(${target}
 )
 add_library(${alias} ALIAS ${target})
 set_target_properties(${target} PROPERTIES
-  CXX_STANDARD 14
-  CXX_STANDARD_REQUIRED ON
-  VERSION ${CLOE_PROJECT_VERSION}
+    CXX_STANDARD 14
+    CXX_STANDARD_REQUIRED ON
+    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
+    VERSION ${CLOE_PROJECT_VERSION}
 )
 set_target_linting(${target})
 target_include_directories(${target}

diff --git a/oak/CMakeLists.txt b/oak/CMakeLists.txt
@@ -24,6 +24,9 @@ set_target_linting(${target})
 set_target_properties(${target} PROPERTIES
     CXX_STANDARD 14
     CXX_STANDARD_REQUIRED ON
+    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
 )
 target_include_directories(${target}
   PUBLIC

diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
@@ -38,13 +38,14 @@ add_library(${alias} ALIAS ${target})
 set_target_properties(${target} PROPERTIES
     CXX_STANDARD 14
     CXX_STANDARD_REQUIRED ON
+    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
     VERSION ${CLOE_PROJECT_VERSION}
 )
 set_target_linting(${target})
 target_include_directories(${target}
   PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
     include
 )
 target_link_libraries(${target}

diff --git a/runtime/Makefile b/runtime/Makefile
@@ -1,7 +1,5 @@
 PROJECT_ROOT := ..
 
-override BUILD_LAYOUT := layout.ini
-
 include ${PROJECT_ROOT}/Makefile.package
 
 # If BUILD_TESTS is disabled, we need to use the dependencies that

diff --git a/runtime/layout.ini b/runtime/layout.ini