diff options
| author | Adam <Adam@anope.org> | 2013-04-06 19:03:07 -0500 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2013-04-06 19:03:07 -0500 |
| commit | ccecfdf44506d97874cdd1bc8b73a273188310c4 (patch) | |
| tree | 230e6abb8e14bf2471054c37e2db568b513a8093 /modules | |
| parent | 32d1184c00bdb43d3cf892b721c2906b2ddc1a14 (diff) | |
Made the missing dependencies message from cmake more descriptive for modules
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/CMakeLists.txt | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 1402a7c68..75d22af4a 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -22,6 +22,8 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS}) # Create an empty list to store extra include directories set(EXTRA_INCLUDES) + set(MODULE TRUE) + # Get the length of the folder name string(LENGTH ${MODULE_FOLDER} FOLDER_LEN) # Add one (the /) @@ -42,7 +44,7 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS}) # Temporary variable for the current source's include directories set(TEMP_INCLUDES) # Calculate the header file dependencies for the given source file - calculate_depends(${SRC} SKIP_DEPENDS FALSE TEMP_INCLUDES) + calculate_depends(${SRC} SKIP_DEPENDS MODULE TEMP_INCLUDES) # If there were some extra include directories, add them to the list if(TEMP_INCLUDES) append_to_list(EXTRA_INCLUDES ${TEMP_INCLUDES}) @@ -54,7 +56,7 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS}) # Reset skip_libraries set(SKIP_LIBRARIES) # Calculate the library dependencies for the given source file - calculate_libraries(${SRC} SKIP_LIBRARIES FALSE TEMP_LDFLAGS TEMP_DEPENDENCIES) + calculate_libraries(${SRC} SKIP_LIBRARIES MODULE TEMP_LDFLAGS TEMP_DEPENDENCIES) if(NOT SKIP_DEPENDS AND NOT SKIP_LIBRARIES) # Reset has_function set(HAS_FUNCTION) @@ -93,8 +95,6 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS}) DESTINATION ${LIB_DIR}/modules ) endif(HAS_FUNCTION) - else(NOT SKIP_DEPENDS AND NOT SKIP_LIBRARIES) - message(" ${SRC} can not be built due to missing dependencies.") endif(NOT SKIP_DEPENDS AND NOT SKIP_LIBRARIES) endforeach(SRC) @@ -137,7 +137,7 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS}) # Temporary variable for the current source's include directories set(TEMP_INCLUDES) # Calculate the header file dependencies for the given source file - calculate_depends(${SRC} SKIP_DEPENDS FALSE TEMP_INCLUDES) + calculate_depends(${SRC} SKIP_DEPENDS MODULE TEMP_INCLUDES) # If there were some extra include directories, add them to the list if(TEMP_INCLUDES) append_to_list(EXTRA_INCLUDES ${TEMP_INCLUDES}) @@ -147,7 +147,7 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS}) # Reset extra dependencies set(TEMP_DEPENDENCIES) # Calculate the library dependencies for the given source file - calculate_libraries(${SRC} SKIP_LIBRARIES FALSE TEMP_LDFLAGS TEMP_DEPENDENCIES) + calculate_libraries(${SRC} SKIP_LIBRARIES MODULE TEMP_LDFLAGS TEMP_DEPENDENCIES) # Check the function dependencies for the given source file check_functions(${SRC} HAS_FUNCTION) @@ -193,8 +193,6 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS}) install(TARGETS ${SO} DESTINATION ${LIB_DIR}/modules ) - else(NOT SKIP_DEPENDS AND NOT SKIP_LIBRARIES AND HAS_FUNCTION) - message(" ${SUBDIR} can not be built due to missing dependencies.") endif(NOT SKIP_DEPENDS AND NOT SKIP_LIBRARIES AND HAS_FUNCTION) # Run the directories CMakeLists.txt if there is one |