Browse Source

Make the vcpkg bin depend on build type for the path mod

pull/18/head
Marek Roszko 6 months ago
parent
commit
e8a6fff5b0
  1. 8
      qa/CMakeLists.txt
  2. 11
      qa/tests/CMakeLists.txt

8
qa/CMakeLists.txt

@ -23,10 +23,16 @@ include( KiCadQABuildUtils )
macro(setup_qa_env target_name)
if( MSVC )
if( CMAKE_BUILD_TYPE STREQUAL "Debug" )
set( VCPKG_BIN "PATH=path_list_prepend:${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin" )
else()
set( VCPKG_BIN "PATH=path_list_prepend:${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin" )
endif()
# Once we move the cmake minimum to 3.22, we can use this for all platforms and not just MSVC
# the old method only worked on MSVC due to a bug in cmake which was later fixed after ENVIRONMENT_MODIFICATION was added
set( PATH_MODIFICATION
"PATH=path_list_prepend:${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin"
"${VCPKG_BIN}"
"PATH=path_list_prepend:${CMAKE_BINARY_DIR}/kicad/"
"PATH=path_list_prepend:${CMAKE_BINARY_DIR}/common/"
"PATH=path_list_prepend:${CMAKE_BINARY_DIR}/api/"

11
qa/tests/CMakeLists.txt

@ -59,17 +59,6 @@ ${NEW_PATHS};" )
set( EXTRA_PYTEST_ENVIRONMENT "DYLD_FALLBACK_LIBRARY_PATH=${CAIRO_LIB_BASE}" )
elseif ( MSVC )
if( CMAKE_BUILD_TYPE STREQUAL "Debug" )
set( NEW_PATHS
"${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin;\
${NEW_PATHS};" )
else()
set( NEW_PATHS
"${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin;\
${NEW_PATHS};" )
endif()
set( EXTRA_PYTEST_ENVIRONMENT "FONTCONFIG_PATH=${CMAKE_SOURCE_DIR}/qa/resources/windows/fonts/" )
endif()

Loading…
Cancel
Save