Fix windows install prefix

Author: pfultz2

share/rocmcmakebuildtools/cmake/ROCMTest.cmake

@@ -25,7 +25,7 @@ add_dependencies(install-tests tests)
 rocm_define_property(TARGET "ROCM_TEST_INSTALLDIR" "Install dir for tests")
 macro(rocm_enable_test_package NAME)
     message(STATUS "Enable test package ${NAME}")
-    set_target_properties(tests PROPERTIES ROCM_TEST_INSTALLDIR ${CMAKE_INSTALL_PREFIX}/libexec/installed-tests/${NAME})
+    set_target_properties(tests PROPERTIES ROCM_TEST_INSTALLDIR ${CMAKE_INSTALL_LIBEXECDIR}/installed-tests/${NAME})
     rocm_package_setup_component(tests DEPENDS COMPONENT runtime)
     rocm_defer(rocm_test_install_ctest)
 endmacro()
@@ -89,7 +89,7 @@ function(rocm_save_test)
     set(COMMAND "")
     foreach(ARG ${PARSE_COMMAND})
         if(TARGET ${ARG})
-            set(INSTALL_PREFIX "$<${_rocm_test_genex_eval}:$<TARGET_PROPERTY:${ARG},ROCM_INSTALL_DIR>>")
+            set(INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/$<${_rocm_test_genex_eval}:$<TARGET_PROPERTY:${ARG},ROCM_INSTALL_DIR>>")
             string(APPEND COMMAND
                     " \"${INSTALL_PREFIX}/$<TARGET_FILE_NAME:${ARG}>\"")
         else()

test/pass/libprivate.cmake

@@ -6,6 +6,11 @@ install_dir(
     ${TEST_DIR}/libprivate
     CMAKE_ARGS -DROCM_SYMLINK_LIBS=OFF -DROCM_PREFIX=rocm
     TARGETS package)
-test_expect_file(${PREFIX}/lib/libprivate/include/simpleprivate.h)
-test_expect_file(${PREFIX}/lib/libprivate/lib/libsimple_private.a)
+if(WIN32)
+    test_expect_file(${PREFIX}/include/simpleprivate.h)
+    test_expect_file(${PREFIX}/lib/libsimple_private.a)
+else()
+    test_expect_file(${PREFIX}/lib/libprivate/include/simpleprivate.h)
+    test_expect_file(${PREFIX}/lib/libprivate/lib/libsimple_private.a)
+endif()
 install_dir(${TEST_DIR}/libprivate)

test/pass/simple-prefix.cmake

@@ -7,5 +7,7 @@ install_dir(
     CMAKE_ARGS -DROCM_PREFIX=simple
     TARGETS package)
 test_expect_file(${PREFIX}/include/simple.h)
-test_expect_file(${PREFIX}/simple/include/simple.h)
+if(NOT WIN32)
+    test_expect_file(${PREFIX}/simple/include/simple.h)
+endif()
 install_dir(${TEST_DIR}/libbasic)