no fesapi lib prefix on unix

F2I-Consulting · Aug 12, 2024 · 896cdcf · 896cdcf
1 parent a40ed14
commit 896cdcf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -227,7 +227,7 @@ jobs:
             unzip manylinux.zip &&
             mkdir fesapi-build &&
             cd fesapi-build &&
-            cmake3 -DCMAKE_BUILD_TYPE=Release -DHDF5_ROOT=/hdf5-install -DHDF5_USE_STATIC_LIBRARIES=TRUE -DWITH_PYTHON_WRAPPING=TRUE -DCMAKE_INSTALL_PREFIX:STRING=/fesapi-install /fesapi-manylinux &&
+            cmake3 -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=/boost-install -DHDF5_ROOT=/hdf5-install -DHDF5_USE_STATIC_LIBRARIES=TRUE -DCMAKE_INSTALL_PREFIX:STRING=/fesapi-install /fesapi-manylinux &&
             cmake3 --build . -j2 --config Release &&
             cmake3 --install . &&
             cd / &&

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -49,6 +49,9 @@ if (WITH_FESAPI)
 	set (FESAPI_LIBRARY_DIR_RELEASE ",'${FESAPI_LIBRARY_DIR_RELEASE}'")
 	#cmake_path(GET FESAPI_LIBRARY_RELEASE STEM LAST_ONLY FESAPI_LIBRARY_RELEASE_WLE)
 	get_filename_component(FESAPI_LIBRARY_RELEASE_WLE ${FESAPI_LIBRARY_RELEASE} NAME_WLE)
+	if (UNIX)
+		string(REGEX REPLACE "^lib" "" FESAPI_LIBRARY_RELEASE_WLE ${FESAPI_LIBRARY_RELEASE_WLE})
+	endif()
 	set (FESAPI_LIBRARY_RELEASE_WLE ",'${FESAPI_LIBRARY_RELEASE_WLE}'")
 endif ()
 if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")