Skip to content
Snippets Groups Projects
Commit 5137d268 authored by Joscha Schmiedt's avatar Joscha Schmiedt
Browse files

Merge branch 'f-34-building-shared-libraries-on-windows-fails' of...

Merge branch 'f-34-building-shared-libraries-on-windows-fails' of gitlab.com:linkahead/linkahead-cpplib into f-34-building-shared-libraries-on-windows-fails
parents 3d52a9d2 cfe207a7
No related branches found
No related tags found
2 merge requests!61Release 0.3.0,!48Fix compilation errors on Windows
......@@ -177,10 +177,18 @@ else()
SHARED ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED})
set(LIBCAOSDB caosdb)
endif()
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)
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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment