Skip to content

Commit 3799bde

Browse files
committed
Added more conditions
1 parent 0727270 commit 3799bde

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

tests/CMakeLists.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,26 @@ target_link_libraries(
2929
GTest::gtest_main
3030
)
3131

32-
set(MSVC_LIBRARY_EXTENSION lib)
32+
set(MSVC_LIBRARY_PATH lib)
3333
set(MINGW_LIBRARY_EXTENSION a)
34+
set(GTEST_DIR "${CMAKE_BINARY_DIR}/lib")
3435

3536
if (NOT GITHUB_ACTIONS)
3637
set(MSVC_LIBRARY_EXTENSION dll)
3738
set(MINGW_LIBRARY_EXTENSION dll)
39+
set(GTEST_DIR "${CMAKE_BINARY_DIR}/bin")
3840
endif ()
3941

4042
if(WIN32)
4143
if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
4244
add_custom_command(TARGET ${PROJECT_NAME}_tests POST_BUILD
43-
COMMAND "cp" ARGS "${CMAKE_BINARY_DIR}/bin/Debug/gtest.${MSVC_LIBRARY_EXTENSION}" "${CMAKE_BINARY_DIR}/Debug/gtest.${MSVC_LIBRARY_EXTENSION}"
44-
COMMAND "cp" ARGS "${CMAKE_BINARY_DIR}/bin/Debug/gtest_main.${MSVC_LIBRARY_EXTENSION}" "${CMAKE_BINARY_DIR}/Debug/gtest_main.${MSVC_LIBRARY_EXTENSION}"
45+
COMMAND "cp" ARGS "${GTEST_DIR}/Debug/gtest.${MSVC_LIBRARY_EXTENSION}" "${CMAKE_BINARY_DIR}/Debug/gtest.${MSVC_LIBRARY_EXTENSION}"
46+
COMMAND "cp" ARGS "${GTEST_DIR}/Debug/gtest_main.${MSVC_LIBRARY_EXTENSION}" "${CMAKE_BINARY_DIR}/Debug/gtest_main.${MSVC_LIBRARY_EXTENSION}"
4547
COMMENT "Copying to output directory")
4648
else ()
4749
add_custom_command(TARGET ${PROJECT_NAME}_tests POST_BUILD
48-
COMMAND "cp" ARGS "${CMAKE_BINARY_DIR}/bin/libgtest.${MINGW_LIBRARY_EXTENSION}" "${CMAKE_BINARY_DIR}/libgtest.${MINGW_LIBRARY_EXTENSION}"
49-
COMMAND "cp" ARGS "${CMAKE_BINARY_DIR}/bin/libgtest_main.${MINGW_LIBRARY_EXTENSION}" "${CMAKE_BINARY_DIR}/libgtest_main.${MINGW_LIBRARY_EXTENSION}"
50+
COMMAND "cp" ARGS "${GTEST_DIR}/libgtest.${MINGW_LIBRARY_EXTENSION}" "${CMAKE_BINARY_DIR}/libgtest.${MINGW_LIBRARY_EXTENSION}"
51+
COMMAND "cp" ARGS "${GTEST_DIR}/libgtest_main.${MINGW_LIBRARY_EXTENSION}" "${CMAKE_BINARY_DIR}/libgtest_main.${MINGW_LIBRARY_EXTENSION}"
5052
COMMENT "Copying to output directory")
5153
endif()
5254
endif()

0 commit comments

Comments
 (0)