Skip to content

Commit 2b5cf81

Browse files
committed
all: Ensure editable mode works for all packages
1 parent 77a135a commit 2b5cf81

File tree

6 files changed

+13
-23
lines changed

6 files changed

+13
-23
lines changed

engine/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ add_executable(${target}
7676
set_target_properties(${target} PROPERTIES
7777
CXX_STANDARD 14
7878
CXX_STANDARD_REQUIRED ON
79+
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin
7980
OUTPUT_NAME ${output}
8081
)
8182
target_compile_definitions(${target}

models/CMakeLists.txt

+6-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@ add_library(${target}
2323
)
2424
add_library(${alias} ALIAS ${target})
2525
set_target_properties(${target} PROPERTIES
26-
CXX_STANDARD 14
27-
CXX_STANDARD_REQUIRED ON
28-
VERSION ${CLOE_PROJECT_VERSION}
26+
CXX_STANDARD 14
27+
CXX_STANDARD_REQUIRED ON
28+
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
29+
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
30+
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
31+
VERSION ${CLOE_PROJECT_VERSION}
2932
)
3033
set_target_linting(${target})
3134
target_include_directories(${target}

oak/CMakeLists.txt

+3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ set_target_linting(${target})
2424
set_target_properties(${target} PROPERTIES
2525
CXX_STANDARD 14
2626
CXX_STANDARD_REQUIRED ON
27+
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
28+
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
29+
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
2730
)
2831
target_include_directories(${target}
2932
PUBLIC

runtime/CMakeLists.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,14 @@ add_library(${alias} ALIAS ${target})
3838
set_target_properties(${target} PROPERTIES
3939
CXX_STANDARD 14
4040
CXX_STANDARD_REQUIRED ON
41+
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
42+
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
43+
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
4144
VERSION ${CLOE_PROJECT_VERSION}
4245
)
4346
set_target_linting(${target})
4447
target_include_directories(${target}
4548
PUBLIC
46-
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src>
47-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
4849
include
4950
)
5051
target_link_libraries(${target}

runtime/Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
PROJECT_ROOT := ..
22

3-
override BUILD_LAYOUT := layout.ini
4-
53
include ${PROJECT_ROOT}/Makefile.package
64

75
# If BUILD_TESTS is disabled, we need to use the dependencies that

runtime/layout.ini

-16
This file was deleted.

0 commit comments

Comments
 (0)