Skip to content
Snippets Groups Projects

Fix compilation errors on Windows

Merged Joscha Schmiedt requested to merge f-34-building-shared-libraries-on-windows-fails into dev
1 file
+ 4
4
Compare changes
  • Side-by-side
  • Inline
+ 4
4
@@ -101,9 +101,11 @@ set(PROTO_PATH ${PROJECT_SOURCE_DIR}/proto/proto)
IF (WIN32)
set(_PROTOBUF_PROTOC "${CMAKE_BINARY_DIR}/build_tools/protoc.exe")
set(_GRPC_CPP_PLUGIN_EXECUTABLE "${CMAKE_BINARY_DIR}/build_tools/grpc_cpp_plugin.exe")
set(STDFSLIB "")
ELSE()
set(_PROTOBUF_PROTOC "${CMAKE_BINARY_DIR}/build_tools/protoc")
set(_GRPC_CPP_PLUGIN_EXECUTABLE "${CMAKE_BINARY_DIR}/build_tools/grpc_cpp_plugin")
set(STDFSLIB stdc++fs)
ENDIF()
# Generated sources
@@ -199,8 +201,7 @@ else()
add_library(caosdb
SHARED ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED})
target_link_libraries(caosdb
grpc::grpc protobuf::protobuf boost::boost
stdc++fs
grpc::grpc protobuf::protobuf boost::boost ${STDFSLIB}
)
set(LIBCAOSDB caosdb)
endif()
@@ -221,8 +222,7 @@ target_include_directories(caosdb PUBLIC
add_library(ccaosdb SHARED src/ccaosdb.cpp)
target_link_libraries(ccaosdb
grpc::grpc protobuf::protobuf boost::boost
${LIBCAOSDB}
stdc++fs
${LIBCAOSDB} $(STDFSLIB)
)
target_include_directories(ccaosdb PUBLIC
$<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
Loading