diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 4b095c8..5e4a01b 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -69,12 +69,17 @@ ENDIF()
 SCIQLOP_SET_TO_PARENT_SCOPE(SQPCORE_LIBRARY_NAME)
 
 ## Copy extern shared libraries to the lib folder
-#LIST (APPEND ${EXTERN_SHARED_LIBRARIES} ${CATALOGUEAPI_LIBRARIES})
+LIST (APPEND ${EXTERN_SHARED_LIBRARIES} ${CATALOGUEAPI_LIBRARIES})
 
-#SCIQLOP_COPY_TO_TARGET(LIBRARY ${SQPCORE_LIBRARY_NAME} ${CATALOGUEAPI_LIBRARIES})
-#if(APPLE)
-#SCIQLOP_COPY_TO_TARGET(RUNTIME ${SQPCORE_LIBRARY_NAME} ${CATALOGUEAPI_LIBRARIES})
-#endif()
+
+SET (COPY_LIBS_DESTINATION LIBRARY)
+if(APPLE)
+    SET (COPY_LIBS_DESTINATION RUNTIME)
+endif()
+
+add_custom_command(TARGET ${SQPCORE_LIBRARY_NAME} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy ${CATALOGUEAPI_LIBRARIES} ${EXECUTABLE_OUTPUT_PATH}
+)
 
 # Add the files to the list of files to be analyzed
 LIST(APPEND CHECKSTYLE_INPUT_FILES ${MODULE_SOURCES})
diff --git a/extern/CatalogueAPI.cmake b/extern/CatalogueAPI.cmake
index 1a37731..7bacfa1 100644
--- a/extern/CatalogueAPI.cmake
+++ b/extern/CatalogueAPI.cmake
@@ -48,7 +48,6 @@ ExternalProject_Add(
 
     BUILD_COMMAND ${NinjaExec} -C "${CATALOGUEAPI_BUILD_PATH}"
     INSTALL_COMMAND ${NinjaExec} -C "${CATALOGUEAPI_BUILD_PATH}" install
-    TEST_COMMAND ${NinjaExec} -C "${CATALOGUEAPI_BUILD_PATH}" test
     LOG_DOWNLOAD 1
     LOG_UPDATE 1
 )
@@ -70,10 +69,5 @@ set(CATALOGUEAPI_INCLUDE ${CATALOGUEAPI_SOURCES_PATH}/src)
 set(CATALOGUEAPI_LIBRARIES  ${CATALOGUEAPI_SOURCES_PATH}/${CATALOG_LIB_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}CatalogueAPI${CMAKE_SHARED_LIBRARY_SUFFIX})
 list(APPEND CATALOGUEAPI_LIBRARIES ${CATALOGUEAPI_SOURCES_PATH}/${CATALOG_LIB_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}QxOrm${CMAKE_SHARED_LIBRARY_SUFFIX})
 
-#message("CMAKE_SHARED_LIBRARY_PREFIX: ${CMAKE_SHARED_LIBRARY_PREFIX}")
-#message("CMAKE_SHARED_LIBRARY_SUFFIX: ${CMAKE_SHARED_LIBRARY_SUFFIX}")
-#message("CATALOGUEAPI_INCLUDE: ${CATALOGUEAPI_INCLUDE}")
-#message("CATALOGUEAPI_LIBRARIES: ${CATALOGUEAPI_LIBRARIES}")
-
 mark_as_advanced(CATALOGUEAPI_INCLUDE)
 mark_as_advanced(CATALOGUEAPI_LIBRARIES)