Skip to content

Commit badc851

Browse files
committed
Don't install flang_rt.unittest target
1 parent ddee555 commit badc851

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

flang-rt/cmake/modules/AddFlangRT.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@ function (add_flangrt_library name)
3737
"${multiValueArgs}"
3838
${ARGN})
3939

40+
if (ARG_INSTALL_WITH_TOOLCHAIN AND ARG_EXCLUDE_FROM_ALL)
41+
message(SEND_ERROR "add_flangrt_library(${name} ...):
42+
INSTALL_WITH_TOOLCHAIN and EXCLUDE_FROM_ALL are in conflict. When
43+
installing an artifact it must have been built first in the 'all' target.
44+
")
45+
endif ()
46+
4047
# Also add header files to IDEs to list as part of the library
4148
set_source_files_properties(${ARG_ADDITIONAL_HEADERS} PROPERTIES HEADER_FILE_ONLY ON)
4249

flang-rt/lib/flang_rt/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ else()
151151
add_flangrt_library(${name} ${libtype}
152152
${sources}
153153
${ARGN}
154-
INSTALL_WITH_TOOLCHAIN
155154
ADDITIONAL_HEADERS ${public_headers} ${private_headers}
156155
)
157156

@@ -168,8 +167,8 @@ else()
168167
add_dependencies(flang_rt ${name})
169168
endfunction ()
170169

171-
add_win_flangrt_library(STATIC static MultiThreaded)
172-
add_win_flangrt_library(STATIC static_dbg MultiThreadedDebug)
170+
add_win_flangrt_library(STATIC static MultiThreaded INSTALL_WITH_TOOLCHAIN)
171+
add_win_flangrt_library(STATIC static_dbg MultiThreadedDebug INSTALL_WITH_TOOLCHAIN)
173172

174173
# unittests link against LLVMSupport which is compiled with /MD
175174
add_win_flangrt_library(STATIC unittest MultiThreadedDLL EXCLUDE_FROM_ALL)

0 commit comments

Comments
 (0)