Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit 10d580f9 authored by saubatn's avatar saubatn
Browse files

UPDATED Better CMake information when configuring.

parent d0850f9d
......@@ -22,7 +22,6 @@ macro(camitk_add_subdirectory DirectoryName)
if(CEP_NAME AND NOT ${CEP_NAME} STREQUAL ${CMAKE_PROJECT_NAME})
set(SUBDIRECTORY_MESSAGE "${SUBDIRECTORY_MESSAGE} ${CEP_NAME}")
endif()
message(STATUS "${SUBDIRECTORY_MESSAGE} provides ${DirectoryName}:")
add_subdirectory(${DirectoryName})
endif()
endmacro()
\ No newline at end of file
......@@ -171,7 +171,7 @@ macro(camitk_library)
#########################################################################
# CMAKE TARGET DEFINITION DEPENDENDING ON THE LIBRARY TYPE (SHARED or STATIC)
if (${DEFAULT_LIBRARY_NAME_CMAKE}_SHARED) # shared library
message(STATUS "Adding shared library: ${LIBRARY_TARGET_NAME}")
message(STATUS "Building shared library: ${LIBRARY_TARGET_NAME}")
add_library(${LIBRARY_TARGET_NAME} SHARED ${${DEFAULT_LIBRARY_NAME_CMAKE}_SOURCES})
# prepare the library specific info (SONAME...)
set(${LIBRARY_TARGET_NAME}_LIBRARY_PROPERTIES ${${LIBRARY_TARGET_NAME}_LIBRARY_PROPERTIES}
......@@ -181,7 +181,7 @@ macro(camitk_library)
#
set_target_properties(${LIBRARY_TARGET_NAME} PROPERTIES ${${LIBRARY_TARGET_NAME}_LIBRARY_PROPERTIES} LINK_INTERFACE_LIBRARIES "")
elseif (${DEFAULT_LIBRARY_NAME_CMAKE}_STATIC) # static library
message(STATUS "Adding static library: ${LIBRARY_TARGET_NAME}")
message(STATUS "Building static library: ${LIBRARY_TARGET_NAME}")
add_library(${LIBRARY_TARGET_NAME} STATIC ${${DEFAULT_LIBRARY_NAME_CMAKE}_SOURCES})
else()
message(FATAL_ERROR "In adding static library ${LIBRARY_TARGET_NAME}.\n Please specify the library type: SHARED or STATIC")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment