From ea460b1aaf078e13e37c4290fc4d79cf8b8145a6 Mon Sep 17 00:00:00 2001 From: Sven Czarnian Date: Sun, 10 Oct 2021 20:50:20 +0200 Subject: [PATCH] fix path errors --- cmake/3rdPartyTargets.cmake | 6 +++--- cmake/Protobuf.cmake | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/3rdPartyTargets.cmake b/cmake/3rdPartyTargets.cmake index 8961dc8..bd68caf 100644 --- a/cmake/3rdPartyTargets.cmake +++ b/cmake/3rdPartyTargets.cmake @@ -50,10 +50,10 @@ TARGET_INCLUDE_DIRECTORIES(GSL INTERFACE "${CMAKE_SOURCE_DIR}/external/include") ADD_LIBRARY(protobuf STATIC IMPORTED) IF (MSVC) SET_TARGET_PROPERTIES(protobuf PROPERTIES - IMPORTED_LOCATION_DEBUG "${CMAKE_INSTALL_PREFIX}/lib/libprotobufd.lib" - IMPORTED_LOCATION_RELEASE "${CMAKE_INSTALL_PREFIX}/lib/libprotobuf.lib" + IMPORTED_LOCATION_DEBUG "${CMAKE_SOURCE_DIR}/external/lib/libprotobufd.lib" + IMPORTED_LOCATION_RELEASE "${CMAKE_SOURCE_DIR}/external/lib/libprotobuf.lib" ) - TARGET_INCLUDE_DIRECTORIES(protobuf INTERFACE "${CMAKE_INSTALL_PREFIX}/include") + TARGET_INCLUDE_DIRECTORIES(protobuf INTERFACE "${CMAKE_SOURCE_DIR}/external/include") ELSE () MESSAGE(FATAL_ERROR "Unsupported compiler") ENDIF () diff --git a/cmake/Protobuf.cmake b/cmake/Protobuf.cmake index d4b1413..ff56571 100644 --- a/cmake/Protobuf.cmake +++ b/cmake/Protobuf.cmake @@ -31,7 +31,7 @@ FUNCTION(ProtobufCompile PROTO_FILES SOURCE_FILES) DEPENDS protobuf COMMAND ${CMAKE_SOURCE_DIR}/external/bin/protoc.exe ARGS -I=${DIRECTORY} --cpp_out=${CMAKE_CURRENT_BINARY_DIR}/protobuf ${PROTO} - WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}/bin" + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/external/bin" COMMENT "Creating C++-sources for ${PROTO}" )