diff --git a/cmake/TestPackageConfig.cmake b/cmake/TestPackageConfig.cmake index 9aa5df038..2b66c2366 100644 --- a/cmake/TestPackageConfig.cmake +++ b/cmake/TestPackageConfig.cmake @@ -1,13 +1,3 @@ -# Create the build directory -execute_process ( - COMMAND ${CMAKE_COMMAND} -E make_directory ${TEST_BINARY_DIR} - RESULT_VARIABLE _DIRECTORY_CREATED_SUCCEEDED -) - -if (NOT _DIRECTORY_CREATED_SUCCEEDED EQUAL 0) - message (FATAL_ERROR "Failed to create build directory") -endif (NOT _DIRECTORY_CREATED_SUCCEEDED EQUAL 0) - if (GENERATOR_TOOLSET) list (APPEND _ADDITIONAL_ARGS -T ${GENERATOR_TOOLSET}) endif (GENERATOR_TOOLSET) @@ -29,9 +19,9 @@ execute_process ( ${_ADDITIONAL_ARGS} -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON - -DCMAKE_PREFIX_PATH=${PACKAGE_DIR} - ${SOURCE_DIR} - WORKING_DIRECTORY ${TEST_BINARY_DIR} + -Dglog_ROOT=${PACKAGE_DIR} + -S ${SOURCE_DIR} + -B ${TEST_BINARY_DIR} RESULT_VARIABLE _GENERATE_SUCCEEDED )