diff --git a/CMakeLists.txt b/CMakeLists.txt index 11d30e87fdf..448ca94d6b5 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. ##################################################################################### -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.15 FATAL_ERROR) if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") message(FATAL_ERROR "The binary and source directroy cannot be the same") @@ -91,12 +91,6 @@ set(MIGRAPHX_ENABLE_FPGA Off CACHE BOOL "") set(CMAKE_CXX_STANDARD_DEFAULT "") add_compile_options($<$:-std=c++17>) -if(${CMAKE_VERSION} VERSION_LESS "3.12.0") - set(CONFIGURE_DEPENDS) -else() - set(CONFIGURE_DEPENDS CONFIGURE_DEPENDS) -endif() - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) include(EnableCompilerWarnings) include(ROCMClangTidy) diff --git a/src/onnx/CMakeLists.txt b/src/onnx/CMakeLists.txt index 4d9b46f7e0b..096c7b6ecc6 100755 --- a/src/onnx/CMakeLists.txt +++ b/src/onnx/CMakeLists.txt @@ -30,7 +30,7 @@ target_compile_options(onnx-proto PRIVATE -w) target_link_libraries(onnx-proto PRIVATE ${PROTOBUF_LIBRARY}) set_target_properties(onnx-proto PROPERTIES POSITION_INDEPENDENT_CODE On) -file(GLOB ONNX_SRCS ${CONFIGURE_DEPENDS} *.cpp) +file(GLOB ONNX_SRCS CONFIGURE_DEPENDS *.cpp) add_library(migraphx_onnx ${ONNX_SRCS}) target_include_directories(migraphx_onnx PRIVATE include) set_target_properties(migraphx_onnx PROPERTIES EXPORT_NAME onnx) diff --git a/src/targets/gpu/CMakeLists.txt b/src/targets/gpu/CMakeLists.txt index 3bb5a95ec28..aeca0c8e612 100644 --- a/src/targets/gpu/CMakeLists.txt +++ b/src/targets/gpu/CMakeLists.txt @@ -42,12 +42,12 @@ else() endif() include(Embed) -file(GLOB KERNEL_FILES ${CONFIGURE_DEPENDS} +file(GLOB KERNEL_FILES CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/kernels/include/migraphx/kernels/*.hpp) message(STATUS "KERNEL_FILES: ${KERNEL_FILES}") add_embed_library(migraphx_kernels ${KERNEL_FILES}) -file(GLOB DEVICE_GPU_SRCS ${CONFIGURE_DEPENDS} ${CMAKE_CURRENT_SOURCE_DIR}/device/*.cpp) +file(GLOB DEVICE_GPU_SRCS CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/device/*.cpp) add_library(migraphx_device ${DEVICE_GPU_SRCS}) add_library(compile_for_gpu INTERFACE) @@ -84,7 +84,7 @@ target_link_libraries(kernel_file_check compile_for_gpu) rocm_clang_tidy_check(kernel_file_check) -file(GLOB JIT_GPU_SRCS ${CONFIGURE_DEPENDS} ${CMAKE_CURRENT_SOURCE_DIR}/jit/*.cpp) +file(GLOB JIT_GPU_SRCS CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/jit/*.cpp) add_library(migraphx_gpu abs.cpp analyze_streams.cpp diff --git a/src/targets/gpu/driver/CMakeLists.txt b/src/targets/gpu/driver/CMakeLists.txt index fee3d016809..c6ad9fa2a06 100755 --- a/src/targets/gpu/driver/CMakeLists.txt +++ b/src/targets/gpu/driver/CMakeLists.txt @@ -22,7 +22,7 @@ # THE SOFTWARE. ##################################################################################### -file(GLOB GPU_DRIVER_SRCS ${CONFIGURE_DEPENDS} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) +file(GLOB GPU_DRIVER_SRCS CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) add_executable(gpu-driver ${GPU_DRIVER_SRCS} ) diff --git a/src/tf/CMakeLists.txt b/src/tf/CMakeLists.txt index 01fcb134fb8..8a854226bf4 100644 --- a/src/tf/CMakeLists.txt +++ b/src/tf/CMakeLists.txt @@ -42,7 +42,7 @@ target_compile_options(tf-proto PRIVATE -w) target_link_libraries(tf-proto PRIVATE ${PROTOBUF_LIBRARY}) set_target_properties(tf-proto PROPERTIES POSITION_INDEPENDENT_CODE On) -file(GLOB TF_SRCS ${CONFIGURE_DEPENDS} *.cpp) +file(GLOB TF_SRCS CONFIGURE_DEPENDS *.cpp) add_library(migraphx_tf ${TF_SRCS}) migraphx_generate_export_header(migraphx_tf) target_include_directories(migraphx_tf PRIVATE include) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 45c555d4fac..71fe51331a5 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -112,7 +112,7 @@ function(add_test_executable TEST_NAME) target_include_directories(${TEST_NAME} PUBLIC include) endfunction(add_test_executable) -file(GLOB TESTS ${CONFIGURE_DEPENDS} *.cpp) +file(GLOB TESTS CONFIGURE_DEPENDS *.cpp) foreach(TEST ${TESTS}) get_filename_component(BASE_NAME ${TEST} NAME_WE) @@ -122,7 +122,7 @@ endforeach() if(MIGRAPHX_ENABLE_GPU) # gpu tests - file(GLOB GPU_TESTS ${CONFIGURE_DEPENDS} gpu/*.cpp) + file(GLOB GPU_TESTS CONFIGURE_DEPENDS gpu/*.cpp) foreach(TEST ${GPU_TESTS}) get_filename_component(BASE_NAME ${TEST} NAME_WE) @@ -141,7 +141,7 @@ endif() if(MIGRAPHX_ENABLE_FPGA) # fpga tests - file(GLOB FPGA_TESTS ${CONFIGURE_DEPENDS} fpga/*.cpp) + file(GLOB FPGA_TESTS CONFIGURE_DEPENDS fpga/*.cpp) foreach(TEST ${FPGA_TESTS}) get_filename_component(BASE_NAME ${TEST} NAME_WE) @@ -191,7 +191,7 @@ endif() # multitarget test if(MIGRAPHX_ENABLE_GPU AND MIGRAPHX_ENABLE_CPU AND MIGRAPHX_ENABLE_FPGA) set(TEST_MULTI_TARGET_DIR ${CMAKE_CURRENT_SOURCE_DIR}/multi_target) - file(GLOB MULTI_TARGET_TESTS ${CONFIGURE_DEPENDS} ${TEST_MULTI_TARGET_DIR}/*.cpp) + file(GLOB MULTI_TARGET_TESTS CONFIGURE_DEPENDS ${TEST_MULTI_TARGET_DIR}/*.cpp) foreach(MULTI_TARGET_TEST ${MULTI_TARGET_TESTS}) get_filename_component(BASE_NAME ${MULTI_TARGET_TEST} NAME_WE) @@ -221,7 +221,7 @@ function(test_header NAME HEADER) endfunction() function(test_headers PREFIX) - file(GLOB HEADERS ${CONFIGURE_DEPENDS} ${ARGN}) + file(GLOB HEADERS CONFIGURE_DEPENDS ${ARGN}) foreach(HEADER ${HEADERS}) file(RELATIVE_PATH HEADER_REL ${CMAKE_SOURCE_DIR} ${HEADER}) diff --git a/test/verify/CMakeLists.txt b/test/verify/CMakeLists.txt index e41b1ea7273..f0088bb1eb4 100644 --- a/test/verify/CMakeLists.txt +++ b/test/verify/CMakeLists.txt @@ -22,7 +22,7 @@ # THE SOFTWARE. ##################################################################################### -file(GLOB VERIFY_TESTS ${CONFIGURE_DEPENDS} *.cpp) +file(GLOB VERIFY_TESTS CONFIGURE_DEPENDS *.cpp) add_executable(test_verify ${VERIFY_TESTS}) add_dependencies(tests test_verify)