Skip to content

Commit b1c6e02

Browse files
robertsipkarobertsipka
committed
Re-thinking the build system to bring it more into line with the conventions.
We removed that implementation where the build directory isn't set up to build with exactly one configuration of the project but potentially several variants: the same build directory can/must be used for debug and release builds, for full or compact profile versions, etc. So we reworked the CMakeLists, and now one build dir deal with exactly one configuration of the project's libraries and tools. JerryScript-DCO-1.0-Signed-off-by: Zsolt Borbély zsborbely.u-szeged@partner.samsung.com JerryScript-DCO-1.0-Signed-off-by: Robert Sipka rsipka.uszeged@partner.samsung.com
1 parent 97be8bf commit b1c6e02

27 files changed

+782
-949
lines changed

‎CMakeLists.txt‎

Lines changed: 177 additions & 453 deletions
Large diffs are not rendered by default.

build/configs/toolchain_afl_i686.cmake renamed to cmake/toolchain_afl_i686.cmake

File renamed without changes.

build/configs/toolchain_afl_x86_64.cmake renamed to cmake/toolchain_afl_x86_64.cmake

File renamed without changes.

build/configs/toolchain_darwin_x86_64.cmake renamed to cmake/toolchain_darwin_x86_64.cmake

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2015 Samsung Electronics Co., Ltd.
1+
# Copyright 2015-2016 Samsung Electronics Co., Ltd.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
1515
set(CMAKE_SYSTEM_NAME Darwin)
1616
set(CMAKE_SYSTEM_PROCESSOR x86_64)
1717

18-
find_program(CMAKE_C_COMPILER NAMES gcc cc)
19-
# FIXME: This could break cross compilation, when the strip is not for the target architecture
20-
find_program(CMAKE_STRIP NAMES strip)
18+
find_program(CMAKE_C_COMPILER NAMES gcc cc)
2119

2220
#set(FLAGS_COMMON_ARCH )

build/configs/toolchain_external.cmake renamed to cmake/toolchain_external.cmake

File renamed without changes.

build/configs/toolchain_linux_armv7l-el.cmake renamed to cmake/toolchain_linux_armv7l-el.cmake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2015 Samsung Electronics Co., Ltd.
1+
# Copyright 2015-2016 Samsung Electronics Co., Ltd.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -16,7 +16,5 @@ set(CMAKE_SYSTEM_NAME Linux)
1616
set(CMAKE_SYSTEM_PROCESSOR armv7l-el)
1717

1818
set(CMAKE_C_COMPILER arm-linux-gnueabi-gcc)
19-
# FIXME: This could break cross compilation, when the strip is not for the target architecture
20-
find_program(CMAKE_STRIP NAMES arm-linux-gnueabi-strip strip)
2119

2220
set(FLAGS_COMMON_ARCH -mlittle-endian -mthumb)

build/configs/toolchain_linux_armv7l-hf.cmake renamed to cmake/toolchain_linux_armv7l-hf.cmake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2015 Samsung Electronics Co., Ltd.
1+
# Copyright 2015-2016 Samsung Electronics Co., Ltd.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@ set(CMAKE_SYSTEM_NAME Linux)
1616
set(CMAKE_SYSTEM_PROCESSOR armv7l-hf)
1717

1818
set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
19-
# FIXME: This could break cross compilation, when the strip is not for the target architecture
20-
find_program(CMAKE_STRIP NAMES arm-linux-gnueabihf-strip strip)
2119
#
2220
# Limit fpu to VFPv3 with d0-d15 registers
2321
#

build/configs/toolchain_linux_i686.cmake renamed to cmake/toolchain_linux_i686.cmake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2015 Samsung Electronics Co., Ltd.
1+
# Copyright 2015-2016 Samsung Electronics Co., Ltd.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -16,5 +16,3 @@ set(CMAKE_SYSTEM_NAME Linux)
1616
set(CMAKE_SYSTEM_PROCESSOR i686)
1717

1818
find_program(CMAKE_C_COMPILER NAMES i686-linux-gnu-gcc i686-unknown-linux-gnu-gcc)
19-
# FIXME: This could break cross compilation, when the strip is not for the target architecture
20-
find_program(CMAKE_STRIP NAMES i686-linux-gnu-strip i686-unknown-linux-gnu-strip strip)

build/configs/toolchain_linux_x86_64.cmake renamed to cmake/toolchain_linux_x86_64.cmake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2015 Samsung Electronics Co., Ltd.
1+
# Copyright 2015-2016 Samsung Electronics Co., Ltd.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -16,7 +16,5 @@ set(CMAKE_SYSTEM_NAME Linux)
1616
set(CMAKE_SYSTEM_PROCESSOR x86_64)
1717

1818
find_program(CMAKE_C_COMPILER NAMES x86_64-linux-gnu-gcc x86_64-unknown-linux-gnu-gcc)
19-
# FIXME: This could break cross compilation, when the strip is not for the target architecture
20-
find_program(CMAKE_STRIP NAMES x86_64-linux-gnu-strip x86_64-unknown-linux-gnu-strip strip)
2119

2220
set(FLAGS_COMMON_ARCH -ffixed-rbp)

build/configs/toolchain_mcu_stm32f3.cmake renamed to cmake/toolchain_mcu_stm32f3.cmake

File renamed without changes.

0 commit comments

Comments
 (0)