github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-04-27 20:58:44 +00:00
Code Issues Projects Releases Wiki Activity

cmake: Don't link maiko into setsout, tstsout. (#305)

Browse Source 
These only need byteswap utils, not the fully maiko set of
sources. This makes this behave like the old make-based
build system.
This commit is contained in:
Bruce Mitchener
2021-01-27 13:22:19 +07:00
committed by GitHub
parent 100248e7a7
commit b6f46cd1f0
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@@ -43,17 +43,13 @@ IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR
CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" OR
CMAKE_SYSTEM_PROCESSOR STREQUAL "x86" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "x86" OR
CMAKE_SYSTEM_PROCESSOR STREQUAL "i386" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "i386" OR
CMAKE_SYSTEM_PROCESSOR STREQUAL "i686") CMAKE_SYSTEM_PROCESSOR STREQUAL "i686" OR
LIST(APPEND MAIKO_DEFINITIONS CMAKE_SYSTEM_PROCESSOR MATCHES "arm.*" OR
"-DBYTESWAP"
)
ENDIF()
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "arm.*" OR
CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
LIST(APPEND MAIKO_DEFINITIONS LIST(APPEND MAIKO_DEFINITIONS
"-DBYTESWAP" "-DBYTESWAP"
) )
SET(BYTESWAP_SRCS src/byteswap.c)
ENDIF() ENDIF()
IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
@@ -112,6 +108,7 @@ SET(BAD_SRCS
) )
SET(MAIKO_SRCS SET(MAIKO_SRCS
${BYTESWAP_SRCS}
src/allocmds.c src/allocmds.c
src/arith2.c src/arith2.c
src/arith3.c src/arith3.c
@@ -128,7 +125,6 @@ SET(MAIKO_SRCS
src/binds.c src/binds.c
src/bitblt.c src/bitblt.c
src/blt.c src/blt.c
src/byteswap.c
src/car-cdr.c src/car-cdr.c
src/chardev.c src/chardev.c
src/common.c src/common.c
@@ -433,10 +429,10 @@ ADD_EXECUTABLE(mkvdate src/mkvdate.c)
TARGET_COMPILE_DEFINITIONS(mkvdate PUBLIC ${MAIKO_DEFINITIONS}) TARGET_COMPILE_DEFINITIONS(mkvdate PUBLIC ${MAIKO_DEFINITIONS})
TARGET_INCLUDE_DIRECTORIES(mkvdate PUBLIC inc) TARGET_INCLUDE_DIRECTORIES(mkvdate PUBLIC inc)
# In the old build system, this didn't link in everything. ADD_EXECUTABLE(setsout src/setsout.c ${BYTESWAP_SRCS})
ADD_EXECUTABLE(setsout src/setsout.c) TARGET_COMPILE_DEFINITIONS(setsout PUBLIC ${MAIKO_DEFINITIONS})
TARGET_LINK_LIBRARIES(setsout maiko) TARGET_INCLUDE_DIRECTORIES(setsout PUBLIC inc)
# In the old build system, this didn't link in everything. ADD_EXECUTABLE(tstsout src/tstsout.c ${BYTESWAP_SRCS})
ADD_EXECUTABLE(tstsout src/tstsout.c) TARGET_COMPILE_DEFINITIONS(tstsout PUBLIC ${MAIKO_DEFINITIONS})
TARGET_LINK_LIBRARIES(tstsout maiko) TARGET_INCLUDE_DIRECTORIES(tstsout PUBLIC inc)