| @@ -69,12 +69,17 ENDIF() | |||||
| 69 | SCIQLOP_SET_TO_PARENT_SCOPE(SQPCORE_LIBRARY_NAME) |
|
69 | SCIQLOP_SET_TO_PARENT_SCOPE(SQPCORE_LIBRARY_NAME) | |
| 70 |
|
70 | |||
| 71 | ## Copy extern shared libraries to the lib folder |
|
71 | ## Copy extern shared libraries to the lib folder | |
| 72 |
|
|
72 | LIST (APPEND ${EXTERN_SHARED_LIBRARIES} ${CATALOGUEAPI_LIBRARIES}) | |
| 73 |
|
73 | |||
| 74 | #SCIQLOP_COPY_TO_TARGET(LIBRARY ${SQPCORE_LIBRARY_NAME} ${CATALOGUEAPI_LIBRARIES}) |
|
74 | ||
| 75 | #if(APPLE) |
|
75 | SET (COPY_LIBS_DESTINATION LIBRARY) | |
| 76 | #SCIQLOP_COPY_TO_TARGET(RUNTIME ${SQPCORE_LIBRARY_NAME} ${CATALOGUEAPI_LIBRARIES}) |
|
76 | if(APPLE) | |
| 77 | #endif() |
|
77 | SET (COPY_LIBS_DESTINATION RUNTIME) | |
|
|
78 | endif() | |||
|
|
79 | ||||
|
|
80 | add_custom_command(TARGET ${SQPCORE_LIBRARY_NAME} POST_BUILD | |||
|
|
81 | COMMAND ${CMAKE_COMMAND} -E copy ${CATALOGUEAPI_LIBRARIES} ${EXECUTABLE_OUTPUT_PATH} | |||
|
|
82 | ) | |||
| 78 |
|
83 | |||
| 79 | # Add the files to the list of files to be analyzed |
|
84 | # Add the files to the list of files to be analyzed | |
| 80 | LIST(APPEND CHECKSTYLE_INPUT_FILES ${MODULE_SOURCES}) |
|
85 | LIST(APPEND CHECKSTYLE_INPUT_FILES ${MODULE_SOURCES}) | |
| @@ -48,7 +48,6 ExternalProject_Add( | |||||
| 48 |
|
48 | |||
| 49 | BUILD_COMMAND ${NinjaExec} -C "${CATALOGUEAPI_BUILD_PATH}" |
|
49 | BUILD_COMMAND ${NinjaExec} -C "${CATALOGUEAPI_BUILD_PATH}" | |
| 50 | INSTALL_COMMAND ${NinjaExec} -C "${CATALOGUEAPI_BUILD_PATH}" install |
|
50 | INSTALL_COMMAND ${NinjaExec} -C "${CATALOGUEAPI_BUILD_PATH}" install | |
| 51 | TEST_COMMAND ${NinjaExec} -C "${CATALOGUEAPI_BUILD_PATH}" test |
|
|||
| 52 | LOG_DOWNLOAD 1 |
|
51 | LOG_DOWNLOAD 1 | |
| 53 | LOG_UPDATE 1 |
|
52 | LOG_UPDATE 1 | |
| 54 | ) |
|
53 | ) | |
| @@ -70,10 +69,5 set(CATALOGUEAPI_INCLUDE ${CATALOGUEAPI_SOURCES_PATH}/src) | |||||
| 70 | set(CATALOGUEAPI_LIBRARIES ${CATALOGUEAPI_SOURCES_PATH}/${CATALOG_LIB_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}CatalogueAPI${CMAKE_SHARED_LIBRARY_SUFFIX}) |
|
69 | set(CATALOGUEAPI_LIBRARIES ${CATALOGUEAPI_SOURCES_PATH}/${CATALOG_LIB_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}CatalogueAPI${CMAKE_SHARED_LIBRARY_SUFFIX}) | |
| 71 | list(APPEND CATALOGUEAPI_LIBRARIES ${CATALOGUEAPI_SOURCES_PATH}/${CATALOG_LIB_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}QxOrm${CMAKE_SHARED_LIBRARY_SUFFIX}) |
|
70 | list(APPEND CATALOGUEAPI_LIBRARIES ${CATALOGUEAPI_SOURCES_PATH}/${CATALOG_LIB_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}QxOrm${CMAKE_SHARED_LIBRARY_SUFFIX}) | |
| 72 |
|
71 | |||
| 73 | #message("CMAKE_SHARED_LIBRARY_PREFIX: ${CMAKE_SHARED_LIBRARY_PREFIX}") |
|
|||
| 74 | #message("CMAKE_SHARED_LIBRARY_SUFFIX: ${CMAKE_SHARED_LIBRARY_SUFFIX}") |
|
|||
| 75 | #message("CATALOGUEAPI_INCLUDE: ${CATALOGUEAPI_INCLUDE}") |
|
|||
| 76 | #message("CATALOGUEAPI_LIBRARIES: ${CATALOGUEAPI_LIBRARIES}") |
|
|||
| 77 |
|
||||
| 78 | mark_as_advanced(CATALOGUEAPI_INCLUDE) |
|
72 | mark_as_advanced(CATALOGUEAPI_INCLUDE) | |
| 79 | mark_as_advanced(CATALOGUEAPI_LIBRARIES) |
|
73 | mark_as_advanced(CATALOGUEAPI_LIBRARIES) | |
General Comments 0
You need to be logged in to leave comments.
Login now