vatger/aman-es
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix path errors

Browse Source
This commit is contained in:
Sven Czarnian
2021-10-10 20:50:20 +02:00
parent 8230538325
commit ea460b1aaf
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/3rdPartyTargets.cmake
View File

@@ -50,10 +50,10 @@ TARGET_INCLUDE_DIRECTORIES(GSL INTERFACE "${CMAKE_SOURCE_DIR}/external/include")
ADD_LIBRARY(protobuf STATIC IMPORTED) ADD_LIBRARY(protobuf STATIC IMPORTED)
IF (MSVC) IF (MSVC)
SET_TARGET_PROPERTIES(protobuf PROPERTIES SET_TARGET_PROPERTIES(protobuf PROPERTIES
IMPORTED_LOCATION_DEBUG "${CMAKE_INSTALL_PREFIX}/lib/libprotobufd.lib" IMPORTED_LOCATION_DEBUG "${CMAKE_SOURCE_DIR}/external/lib/libprotobufd.lib"
IMPORTED_LOCATION_RELEASE "${CMAKE_INSTALL_PREFIX}/lib/libprotobuf.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 () ELSE ()
MESSAGE(FATAL_ERROR "Unsupported compiler") MESSAGE(FATAL_ERROR "Unsupported compiler")
ENDIF () ENDIF ()

2
cmake/Protobuf.cmake
View File

@@ -31,7 +31,7 @@ FUNCTION(ProtobufCompile PROTO_FILES SOURCE_FILES)
DEPENDS protobuf DEPENDS protobuf
COMMAND ${CMAKE_SOURCE_DIR}/external/bin/protoc.exe COMMAND ${CMAKE_SOURCE_DIR}/external/bin/protoc.exe
ARGS -I=${DIRECTORY} --cpp_out=${CMAKE_CURRENT_BINARY_DIR}/protobuf ${PROTO} 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}" COMMENT "Creating C++-sources for ${PROTO}"
) )