Skip to content
Snippets Groups Projects
Commit 56d09768 authored by Soeren Peters's avatar Soeren Peters
Browse files

Merge branch 'feature/updating_googletest' into develop

* feature/updating_googletest:
  Set CMake Output directories for runtime, library, archive and pdb files for all libraries and executuables.
parents cb2d420e a6ca2c33
No related branches found
No related tags found
No related merge requests found
...@@ -106,6 +106,14 @@ function(vf_add_library) ...@@ -106,6 +106,14 @@ function(vf_add_library)
MESSAGE(FATAL_ERROR "build_type=${ARG_BUILDTYPE} doesn't match BINARY, SHARED or STATIC") MESSAGE(FATAL_ERROR "build_type=${ARG_BUILDTYPE} doesn't match BINARY, SHARED or STATIC")
ENDIF() ENDIF()
# Set the output directory for build artifacts
set_target_properties(${library_name}
PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
################################################################# #################################################################
### ADDITIONAL LINK LIBRARIES ### ### ADDITIONAL LINK LIBRARIES ###
################################################################# #################################################################
...@@ -193,6 +201,14 @@ function(vf_add_tests) ...@@ -193,6 +201,14 @@ function(vf_add_tests)
add_executable(${library_test_name} ${MY_SRCS}) add_executable(${library_test_name} ${MY_SRCS})
groupTarget (${library_test_name} ${testFolder}) groupTarget (${library_test_name} ${testFolder})
# Set the output directory for build artifacts
set_target_properties(${library_test_name}
PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
# link tested library # link tested library
target_link_libraries(${library_test_name} PRIVATE ${folder_name}) target_link_libraries(${library_test_name} PRIVATE ${folder_name})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment