68 lines
3.9 KiB
Diff
68 lines
3.9 KiB
Diff
diff -up bcd-d94c9fa77c11afe7d04670d92b3930c417e19f4b/src/core/CMakeLists.txt.links bcd-d94c9fa77c11afe7d04670d92b3930c417e19f4b/src/core/CMakeLists.txt
|
|
--- bcd-d94c9fa77c11afe7d04670d92b3930c417e19f4b/src/core/CMakeLists.txt.links 2020-10-22 20:25:28.604816544 +0200
|
|
+++ bcd-d94c9fa77c11afe7d04670d92b3930c417e19f4b/src/core/CMakeLists.txt 2020-10-22 20:25:56.806537995 +0200
|
|
@@ -87,10 +87,12 @@ IF(CUDA_FOUND)
|
|
${bcd_core_include_folder}/CudaUtils.h
|
|
)
|
|
CUDA_INCLUDE_DIRECTORIES(${bcd_core_include_folder}) # sadly, the TARGET_INCLUDE_DIRECTORIES a few lines below does not work with CUDA, see https://cmake.org/Bug/view.php?id=14201
|
|
- CUDA_ADD_LIBRARY(${target_name} ${src_files} ${header_files} ${header_implementation_files} STATIC)
|
|
+ CUDA_ADD_LIBRARY(${target_name} ${src_files} ${header_files} ${header_implementation_files} SHARED)
|
|
TARGET_COMPILE_DEFINITIONS(${target_name} PRIVATE FOUND_CUDA)
|
|
ELSE(CUDA_FOUND)
|
|
- ADD_LIBRARY(${target_name} STATIC ${src_files} ${header_files} ${header_implementation_files})
|
|
+ ADD_LIBRARY(${target_name} SHARED ${src_files} ${header_files} ${header_implementation_files})
|
|
+ set_property(TARGET ${target_name} PROPERTY VERSION "0.0.0")
|
|
+ set_property(TARGET ${target_name} PROPERTY SOVERSION 0 )
|
|
ENDIF(CUDA_FOUND)
|
|
|
|
|
|
diff -uNr bcd-d94c9fa77c11afe7d04670d92b3930c417e19f4b/src/core/CMakeLists.txt bcd-d94c9fa77c11afe7d04670d92b3930c417e19f4b-orig/src/core/CMakeLists.txt
|
|
--- bcd-d94c9fa77c11afe7d04670d92b3930c417e19f4b/src/core/CMakeLists.txt 2020-10-22 20:29:00.141727229 +0200
|
|
+++ bcd-d94c9fa77c11afe7d04670d92b3930c417e19f4b-orig/src/core/CMakeLists.txt 2020-10-22 20:25:56.806537995 +0200
|
|
@@ -100,7 +100,7 @@
|
|
if (OPENMP_FOUND)
|
|
TARGET_LINK_LIBRARIES(${target_name} PUBLIC OpenMP)
|
|
endif (OPENMP_FOUND)
|
|
-TARGET_LINK_LIBRARIES(${target_name} PRIVATE eigen)
|
|
+#TARGET_LINK_LIBRARIES(${target_name} PRIVATE eigen3)
|
|
|
|
INSTALL(TARGETS ${target_name} ARCHIVE DESTINATION lib)
|
|
|
|
diff -uNr bcd-d94c9fa77c11afe7d04670d92b3930c417e19f4b/src/io/CMakeLists.txt bcd-d94c9fa77c11afe7d04670d92b3930c417e19f4b-orig/src/io/CMakeLists.txt
|
|
--- bcd-d94c9fa77c11afe7d04670d92b3930c417e19f4b/src/io/CMakeLists.txt 2018-06-10 17:18:29.000000000 +0200
|
|
+++ bcd-d94c9fa77c11afe7d04670d92b3930c417e19f4b-orig/src/io/CMakeLists.txt 2020-10-22 20:24:37.680319508 +0200
|
|
@@ -63,7 +63,10 @@
|
|
SET(header_implementation_files
|
|
)
|
|
|
|
-ADD_LIBRARY(${target_name} STATIC ${src_files} ${header_files} ${header_implementation_files})
|
|
+ADD_LIBRARY(${target_name} SHARED ${src_files} ${header_files} ${header_implementation_files})
|
|
+TARGET_LINK_LIBRARIES(${target_name} PRIVATE ${OPENEXR_LDFLAGS} -lIlmImf -lImath -lHalf -lIex -lIexMath -lIlmThread )
|
|
+set_property(TARGET ${target_name} PROPERTY VERSION "0.0.0")
|
|
+set_property(TARGET ${target_name} PROPERTY SOVERSION 0 )
|
|
|
|
|
|
TARGET_INCLUDE_DIRECTORIES(${target_name} PUBLIC "${bcd_include_folder}/io")
|
|
@@ -72,8 +72,8 @@
|
|
|
|
SET_TARGET_PROPERTIES(${target_name} PROPERTIES CXX_STANDARD 11)
|
|
TARGET_LINK_LIBRARIES(${target_name} PUBLIC ${lib_bcd_core})
|
|
-TARGET_LINK_LIBRARIES(${target_name} PRIVATE OpenExr)
|
|
-TARGET_LINK_LIBRARIES(${target_name} PRIVATE Json)
|
|
+TARGET_LINK_LIBRARIES(${target_name} PRIVATE ${OPENEXR_LDFLAGS})
|
|
+TARGET_LINK_LIBRARIES(${target_name} PRIVATE ${JSONCPP_LDFLAGS})
|
|
|
|
INSTALL(TARGETS ${target_name} ARCHIVE DESTINATION lib)
|
|
|
|
diff -up bcd-d94c9fa77c11afe7d04670d92b3930c417e19f4b/src/core/CMakeLists.txt.links bcd-d94c9fa77c11afe7d04670d92b3930c417e19f4b/src/core/CMakeLists.txt
|
|
--- bcd-d94c9fa77c11afe7d04670d92b3930c417e19f4b/src/core/CMakeLists.txt.links 2020-10-22 21:40:35.896688115 +0200
|
|
+++ bcd-d94c9fa77c11afe7d04670d92b3930c417e19f4b/src/core/CMakeLists.txt 2020-10-22 21:43:26.791883540 +0200
|
|
@@ -104,6 +104,6 @@ TARGET_LINK_LIBRARIES(${target_name} PUB
|
|
endif (OPENMP_FOUND)
|
|
#TARGET_LINK_LIBRARIES(${target_name} PRIVATE eigen3)
|
|
|
|
-INSTALL(TARGETS ${target_name} ARCHIVE DESTINATION lib)
|
|
+INSTALL(TARGETS ${target_name} ARCHIVE DESTINATION lib${LIB_SUFFIX})
|
|
|
|
|