Skip to content
Permalink
Browse files

Remove data directory and added proper export for the module.

  • Loading branch information...
viferga committed Jan 13, 2019
1 parent bb09ea5 commit e27b7b3f8d00191064c3556c067e63cb4ecbf4c3
Showing with 15 additions and 17 deletions.
  1. +12 −4 CMakeLists.txt
  2. +0 −10 data/DATA_FOLDER.txt
  3. +3 −3 metacall-config.cmake.in
@@ -202,10 +202,18 @@ set(MODULE_NAMES
)

#
# Project distributable names
# Project export module names
#

# TODO
if(NOT OPTION_BUILD_DIST_LIBS)
set(EXPORT_MODULE_NAMES
${MODULE_NAMES}
)
else()
set(EXPORT_MODULE_NAMES
metacall
)
endif()

#
# Project module includes
@@ -244,5 +252,5 @@ install(FILES AUTHORS DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
install(FILES LICENSE DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
install(FILES README.md DESTINATION ${INSTALL_ROOT} COMPONENT runtime)

# Install runtime data
install(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION ${INSTALL_DATA} COMPONENT runtime)
# # Install runtime data
# install(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION ${INSTALL_DATA} COMPONENT runtime)

This file was deleted.

@@ -18,8 +18,8 @@
#

# List of modules
set(MODULE_NAMES
@MODULE_NAMES@
set(EXPORT_MODULE_NAMES
@EXPORT_MODULE_NAMES@
)

# Macro to search for a specific module
@@ -32,7 +32,7 @@ endmacro()

# Macro to search for all modules
macro(find_modules PREFIX)
foreach(module_name ${MODULE_NAMES})
foreach(module_name ${EXPORT_MODULE_NAMES})
find_module("${CMAKE_CURRENT_LIST_DIR}/${PREFIX}/${module_name}/${module_name}-export.cmake")
endforeach(module_name)
endmacro()

0 comments on commit e27b7b3

Please sign in to comment.
You can’t perform that action at this time.