diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 33612029f..1927b61d9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -129,12 +129,10 @@ ADD_EXECUTABLE(${SWIFTEST_DRIVER} ${DRIVER_src})
 #####################################################
 # Create a library from the source files, except the driver
 ADD_LIBRARY(${SWIFTEST_LIBRARY} ${SWIFTEST_src})
-IF (NOT BUILD_SHARED_LIBS) 
-    SET_PROPERTY(TARGET ${SWIFTEST_LIBRARY} PROPERTY POSITION_INDEPENDENT_CODE)
-ENDIF ()
+SET_PROPERTY(TARGET ${SWIFTEST_LIBRARY} ${SWIFTEST_DRIVER} PROPERTY POSITION_INDEPENDENT_CODE)
 
 TARGET_LINK_LIBRARIES(${SWIFTEST_LIBRARY} PUBLIC netCDF::netcdff HDF5::HDF5)
-TARGET_LINK_LIBRARIES(${SWIFTEST_DRIVER} PUBLIC ${SWIFTEST_LIBRARY} netCDF::netcdff HDF5::HDF5)
+TARGET_LINK_LIBRARIES(${SWIFTEST_DRIVER} PUBLIC netCDF::netcdff HDF5::HDF5)
 
 IF(USE_OPENMP OR USE_SIMD)
     TARGET_LINK_LIBRARIES(${SWIFTEST_LIBRARY} PUBLIC SHTOOLS::parallel)
@@ -147,6 +145,8 @@ ELSE ()
     TARGET_LINK_LIBRARIES(${SWIFTEST_DRIVER} PUBLIC SHTOOLS::serial)
 ENDIF()
 
+TARGET_LINK_LIBRARIES(${SWIFTEST_DRIVER} PUBLIC ${SWIFTEST_LIBRARY})
+
 IF (CMAKE_SYSTEM_NAME STREQUAL "Windows")
    SET_PROPERTY(TARGET ${SWIFTEST_LIBRARY} ${SWIFTEST_DRIVER} APPEND_STRING PROPERTY LINK_FLAGS  "/NODEFAULTLIB")
 ENDIF()