From cfe207a7a178d7dda2ba00a1bfa17ce836ee8f53 Mon Sep 17 00:00:00 2001 From: Joscha Schmiedt <joscha@schmiedt.dev> Date: Mon, 13 May 2024 21:57:52 +0200 Subject: [PATCH] FIX Linker error on windows concerning stdc++fs Partially addresses issue #34 --- CMakeLists.txt | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c4444c6..c8e9b99 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -177,10 +177,18 @@ else() SHARED ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED}) set(LIBCAOSDB caosdb) endif() -target_link_libraries(caosdb - ${CONAN_LIBS} - stdc++fs -) + +IF (WIN32) + target_link_libraries(caosdb + ${CONAN_LIBS} + ) +ELSE() + target_link_libraries(caosdb + ${CONAN_LIBS} + stdc++fs + ) +ENDIF() + target_include_directories(caosdb PUBLIC $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include> @@ -192,11 +200,20 @@ target_include_directories(caosdb SYSTEM PUBLIC ) add_library(ccaosdb SHARED src/ccaosdb.cpp) -target_link_libraries(ccaosdb - ${CONAN_LIBS} - ${LIBCAOSDB} - stdc++fs -) + +IF (WIN32) + target_link_libraries(ccaosdb + ${CONAN_LIBS} + ${LIBCAOSDB} + ) +ELSE() + target_link_libraries(ccaosdb + ${CONAN_LIBS} + ${LIBCAOSDB} + stdc++fs + ) +ENDIF() + target_include_directories(ccaosdb PUBLIC $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include> -- GitLab