Skip to content

Commit 6011619

Browse files
committed
Simplify CMake files, add install support.
1 parent f801afb commit 6011619

File tree

7 files changed

+35
-22
lines changed

7 files changed

+35
-22
lines changed

orc-rt/CMakeLists.txt

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,14 @@
55
#===============================================================================
66

77
cmake_minimum_required(VERSION 3.20.0)
8-
set(LLVM_SUBPROJECT_TITLE "orc-rt")
98

109
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
11-
1210
include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
1311
NO_POLICY_SCOPE)
1412

15-
# Add path for custom orc-rt modules.
16-
list(INSERT CMAKE_MODULE_PATH 0
17-
# "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
18-
# "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
19-
"${LLVM_COMMON_CMAKE_UTILS}"
20-
"${LLVM_COMMON_CMAKE_UTILS}/Modules"
21-
)
22-
23-
set(CMAKE_FOLDER "orc-rt")
13+
project(LibOrcRT LANGUAGES C CXX ASM)
2414

25-
set(LIBORCRT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
26-
set(LIBORCRT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
15+
include(GNUInstallDirs)
2716

2817
#===============================================================================
2918
# Setup CMake Options
@@ -32,16 +21,12 @@ set(LIBORCRT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
3221
set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to conform to")
3322
set(CMAKE_CXX_STANDARD_REQUIRED YES)
3423
set(CMAKE_CXX_EXTENSIONS NO)
35-
36-
#================================
37-
# Setup Compiler Flags
38-
#================================
39-
40-
# Configure compiler. Must happen after setting the target flags.
24+
set(CMAKE_FOLDER "orc-rt")
4125

4226
#===============================================================================
4327
# Setup Source Code
4428
#===============================================================================
4529

30+
add_subdirectory(include)
4631
add_subdirectory(lib)
4732
add_subdirectory(tools)

orc-rt/include/CMakeLists.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
set(files
2+
orc-rt-c/orc-rt.h
3+
)
4+
5+
add_library(orc-rt-headers INTERFACE)
6+
target_include_directories(orc-rt-headers INTERFACE
7+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
8+
$<INSTALL_INTERFACE:include>
9+
)
10+
target_sources(orc-rt-headers
11+
INTERFACE FILE_SET HEADERS
12+
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
13+
FILES ${files}
14+
)
15+
install(TARGETS orc-rt-headers
16+
FILE_SET HEADERS DESTINATION include)

orc-rt/lib/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
add_subdirectory(prelink)
1+
add_subdirectory(executor)

orc-rt/lib/executor/CMakeLists.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
set(files
2+
orc-rt-executor.cpp
3+
)
4+
5+
add_library(orc-rt-executor STATIC ${files})
6+
target_link_libraries(orc-rt-executor
7+
PUBLIC orc-rt-headers
8+
)
9+
install(TARGETS orc-rt-executor
10+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
11+
COMPONENT OrcRT_Development
12+
PUBLIC_HEADER DESTINATION include COMPONENT OrcRT_Development
13+
)

orc-rt/lib/prelink/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
add_executable(orc-executor orc-executor.cpp)
2-
target_link_libraries(orc-executor PRIVATE orc-rt-prelink)
2+
target_link_libraries(orc-executor PRIVATE orc-rt-executor)
33
target_include_directories(orc-executor PRIVATE ../../include)

0 commit comments

Comments
 (0)