Do no more install libs in python folder on linux

F2I-Consulting · Jul 24, 2024 · d5fadbd · d5fadbd
1 parent 786547a
commit d5fadbd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -241,7 +241,7 @@ jobs:
             cmake3 -DCMAKE_BUILD_TYPE=Release -DHDF5_ROOT={project}/../hdf5-install -DHDF5_USE_STATIC_LIBRARIES=TRUE -DWITH_PYTHON_WRAPPING=TRUE -DCMAKE_INSTALL_PREFIX:STRING={project}/../fesapi-install {project} &&
             cmake3 --build . -j2 --config Release &&
             cmake3 --install . &&
-            export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:{project}/../fesapi-install/lib
+            export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:{project}/../fesapi-install/lib64
         with:
           package-dir: ./python
           output-dir: wheelhouse

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -386,11 +386,6 @@ if (WITH_PYTHON_WRAPPING)
 			TARGETS ${CPP_LIBRARY_NAME}
 			RUNTIME DESTINATION ${FESAPI_ROOT_DIR}/python/fesapi/
 		)
-	ELSE ()
-		INSTALL (
-			TARGETS ${CPP_LIBRARY_NAME}
-			LIBRARY DESTINATION ${FESAPI_ROOT_DIR}/python/fesapi/
-		)
 	ENDIF (WIN32)
 	INSTALL(CODE "execute_process(COMMAND	${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/python/setup.py bdist_wheel
 											WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/python)")