Skip to content

Commit 0199260

Browse files
mshelegosys-cmllvm
authored andcommitted
Fix in-tree build
Do not limit component installation to external build
1 parent 98ff865 commit 0199260

File tree

2 files changed

+33
-44
lines changed

2 files changed

+33
-44
lines changed

CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ set(LLVM_GENX_INTRINSICS_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
1616
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
1717
get_filename_component(LLVM_CMAKE_PATH ${LLVM_DIR} ABSOLUTE BASE_DIR ${CMAKE_BINARY_DIR})
1818
set(BUILD_EXTERNAL YES)
19-
if(NOT DEFINED INSTALL_REQUIRED)
20-
set(INSTALL_REQUIRED YES)
21-
endif()
2219
project(LLVM_GenXIntrinsics
2320
VERSION
2421
${LLVM_GENX_INTRINSICS_VERSION}

GenXIntrinsics/CMakeLists.txt

Lines changed: 33 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -47,44 +47,36 @@ if(VC_INTR_ENABLE_LIT_TESTS)
4747
endif()
4848
endif()
4949

50-
# this option is to switch on install when we are building not inside IGC
51-
if(INSTALL_REQUIRED)
52-
install(DIRECTORY include/llvm
53-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
54-
COMPONENT genx-intrinsics-headers
55-
FILES_MATCHING
56-
PATTERN "*.h"
57-
)
58-
59-
# cmake creates too many subdirectories in build directory
60-
# and then "install(DIRECTORY" installs them even if they are empty
61-
# so generated file has to be installed separetely
62-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/llvm/GenXIntrinsics/${GENX_INTRINSICS_DESCRIPTION}
63-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm/GenXIntrinsics
64-
COMPONENT genx-intrinsics-headers
65-
)
66-
67-
# for now not clear do we need to check deps on install,
68-
# so config will only contain single file
69-
# we need to limit it to external build
70-
if(BUILD_EXTERNAL)
71-
install(TARGETS LLVMGenXIntrinsics EXPORT LLVMGenXIntrinsicsTargets
72-
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
73-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
74-
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
75-
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
76-
)
77-
78-
# Legacy export. To remove when all clients switch to new name.
79-
install(EXPORT LLVMGenXIntrinsicsTargets
80-
FILE LLVMGenXIntrinsicsConfig.cmake
81-
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LLVMGenXIntrinsics
82-
)
83-
84-
set(PACKAGE_NAME VCIntrinsics${LLVM_VERSION_MAJOR})
85-
install(EXPORT LLVMGenXIntrinsicsTargets
86-
FILE ${PACKAGE_NAME}Config.cmake
87-
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME}
88-
)
89-
endif() # BUILD_EXTERNAL
90-
endif() # INSTALL_REQUIRED
50+
install(DIRECTORY include/llvm
51+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
52+
COMPONENT genx-intrinsics-headers
53+
FILES_MATCHING
54+
PATTERN "*.h"
55+
)
56+
57+
# cmake creates too many subdirectories in build directory
58+
# and then "install(DIRECTORY" installs them even if they are empty
59+
# so generated file has to be installed separetely
60+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/llvm/GenXIntrinsics/${GENX_INTRINSICS_DESCRIPTION}
61+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm/GenXIntrinsics
62+
COMPONENT genx-intrinsics-headers
63+
)
64+
65+
install(TARGETS LLVMGenXIntrinsics EXPORT LLVMGenXIntrinsicsTargets
66+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
67+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
68+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
69+
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
70+
)
71+
72+
# Legacy export. To remove when all clients switch to new name.
73+
install(EXPORT LLVMGenXIntrinsicsTargets
74+
FILE LLVMGenXIntrinsicsConfig.cmake
75+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LLVMGenXIntrinsics
76+
)
77+
78+
set(PACKAGE_NAME VCIntrinsics${LLVM_VERSION_MAJOR})
79+
install(EXPORT LLVMGenXIntrinsicsTargets
80+
FILE ${PACKAGE_NAME}Config.cmake
81+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME}
82+
)

0 commit comments

Comments
 (0)