Dev (#21)

* better debug output * update example * update readme
2025-11-16 22:27:41 -05:00 · 2019-04-17 13:01:56 +02:00
parent f8899a5912
commit dd63d9fcdb
3 changed files with 88 additions and 56 deletions
--- a/README.md
+++ b/README.md
@@ -23,9 +23,11 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/CPM.cmake)

 CPMAddPackage(
  NAME LarsParser
-  VERSION 1.8  # optional, will try find_package(LarsParser 1.8) before downloading
+  VERSION 1.8
  GIT_REPOSITORY https://github.com/TheLartians/Parser.git
-  GIT_TAG v1.8 # optional, as indirectly defined by VERSION
+  GIT_TAG v1.8 # optional here, as indirectly defined by VERSION
+  OPTIONS      # optional CMake arguments passed to the dependency
+    "LARS_PARSER_BUILD_GLUE_EXTENSION ON"
 )

 # add executable
--- a/cmake/CPM.cmake
+++ b/cmake/CPM.cmake
@@ -6,25 +6,40 @@ if(CPM_DIRECTORY)
  endif()
 endif()

-option(CPM_LOCAL_PACKAGES_ONLY "Use only locally installed packages" OFF)
-option(CPM_REMOTE_PACKAGES_ONLY "Always download packages" OFF)
-
 set(CPM_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} CACHE INTERNAL "")
 set(CPM_PACKAGES "" CACHE INTERNAL "")

+option(CPM_LOCAL_PACKAGES_ONLY "Use only locally installed packages" OFF)
+option(CPM_REMOTE_PACKAGES_ONLY "Always download packages" OFF)
+
 include(FetchContent)
 include(CMakeParseArguments)

-function(CPMRegisterPackage PACKAGE VERSION)
+if(NOT CPM_INDENT)
+  set(CPM_INDENT "CPM:")
+endif()
+
+function(CPM_REGISTER_PACKAGE PACKAGE VERSION)
  LIST(APPEND CPM_PACKAGES ${CPM_ARGS_NAME})
  set(CPM_PACKAGES ${CPM_PACKAGES} CACHE INTERNAL "")
-  set(PACKAGE_VERSION_VARIABLE "CPM_PACKAGE_${PACKAGE}_VERSION")
-  set(${PACKAGE_VERSION_VARIABLE} ${VERSION} CACHE INTERNAL "")
+  CPM_SET_PACKAGE_VERSION(${PACKAGE} ${VERSION})
 endfunction()

-function(CPMGetPreviousPackageVersion PACKAGE)
-  set(PACKAGE_VERSION_VARIABLE "CPM_PACKAGE_${PACKAGE}_VERSION")
-  set(CPM_PREVIOUS_PACKAGE_VERSION "${${PACKAGE_VERSION_VARIABLE}}" PARENT_SCOPE)
+function(CPM_SET_PACKAGE_VERSION PACKAGE VERSION)
+  set("CPM_PACKAGE_${PACKAGE}_VERSION" ${VERSION} CACHE INTERNAL "")
+endfunction()
+
+function(CPM_GET_PACKAGE_VERSION PACKAGE)
+  set(CPM_PACKAGE_VERSION "${CPM_PACKAGE_${PACKAGE}_VERSION}" PARENT_SCOPE)
+endfunction()
+
+function(CPM_PARSE_OPTION OPTION)
+  string(REGEX MATCH "^[^ ]+" OPTION_KEY ${OPTION})
+  string(LENGTH ${OPTION_KEY} OPTION_KEY_LENGTH)
+  math(EXPR OPTION_KEY_LENGTH "${OPTION_KEY_LENGTH}+1")
+  string(SUBSTRING ${OPTION} "${OPTION_KEY_LENGTH}" "-1" OPTION_VALUE)
+  set(OPTION_KEY "${OPTION_KEY}" PARENT_SCOPE)
+  set(OPTION_VALUE "${OPTION_VALUE}" PARENT_SCOPE)
 endfunction()

 function(CPMAddPackage)
@@ -41,34 +56,11 @@ function(CPMAddPackage)

  cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})

-  if (NOT CPM_ARGS_GIT_TAG)
-    set(CPM_ARGS_GIT_TAG v${CPM_ARGS_VERSION})
-  endif()
-
-  if (${CPM_ARGS_NAME} IN_LIST CPM_PACKAGES)
-    CPMGetPreviousPackageVersion(${CPM_ARGS_NAME})
-    message(STATUS "CPM: SKIP ${CPM_ARGS_NAME}@${CPM_ARGS_GIT_TAG}: already addded package ${CPM_ARGS_NAME}@${CPM_PREVIOUS_PACKAGE_VERSION}")
-    return()
-  endif()
-
-  CPMRegisterPackage(${CPM_ARGS_NAME} ${CPM_ARGS_GIT_TAG})
-
-  if (CPM_ARGS_OPTIONS)
-    foreach(OPTION ${CPM_ARGS_OPTIONS})
-      string(REGEX MATCH "^[^ ]+" OPTION_KEY ${OPTION})
-      string(LENGTH ${OPTION_KEY} OPTION_KEY_LENGTH)
-      math(EXPR OPTION_KEY_LENGTH "${OPTION_KEY_LENGTH}+1")
-      string(SUBSTRING ${OPTION} "${OPTION_KEY_LENGTH}" "-1" OPTION_VALUE)
-      set(${OPTION_KEY} ${OPTION_VALUE} CACHE INTERNAL "")
-    endforeach()
-  endif()
-
  if (CPM_ARGS_VERSION AND NOT ${CPM_REMOTE_PACKAGES_ONLY})
    find_package(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION} QUIET)
-    set(CPM_PACKAGE_FOUND ${CPM_ARGS_NAME}_FOUND)

    if(${CPM_PACKAGE_FOUND})
-      message(STATUS "CPM: ADD local package ${CPM_ARGS_NAME}@${CPM_ARGS_VERSION}")
+      message(STATUS "CPM: adding local package ${CPM_ARGS_NAME}@${CPM_ARGS_VERSION}")
      set_target_properties(${CPM_ARGS_NAME} 
        PROPERTIES
          IMPORTED_GLOBAL True
@@ -77,21 +69,59 @@ function(CPMAddPackage)
    endif()
  endif()

-  if (NOT ${CPM_LOCAL_PACKAGES_ONLY})
-
-    message(STATUS "CPM: ADD remote package ${CPM_ARGS_NAME}@${CPM_ARGS_GIT_TAG}")
-
-    set(CPM_PACKAGE_CONTENT ${CPM_ARGS_NAME}_CONTENT)
-
-    FetchContent_Declare(
-      ${CPM_PACKAGE_CONTENT}
-      GIT_TAG ${CPM_ARGS_GIT_TAG}
-      ${CPM_ARGS_UNPARSED_ARGUMENTS}
-    )
-    
-    FetchContent_MakeAvailable(${CPM_PACKAGE_CONTENT})
-  else()
-    MESSAGE(ERROR "CPM could not find the local package ${CPM_ARGS_NAME}@${CPM_ARGS_VERSION}")
+  if (NOT CPM_ARGS_VERSION)
+    set(CPM_ARGS_VERSION 0)
  endif()

+  if (NOT CPM_ARGS_GIT_TAG)
+    set(CPM_ARGS_GIT_TAG v${CPM_ARGS_VERSION})
+  endif()
+
+  if (${CPM_ARGS_NAME} IN_LIST CPM_PACKAGES)
+    CPM_GET_PACKAGE_VERSION(${CPM_ARGS_NAME})
+    if(${CPM_PACKAGE_VERSION} VERSION_LESS ${CPM_ARGS_VERSION})
+      message(WARNING "${CPM_INDENT} newer package ${CPM_ARGS_NAME} requested (${CPM_ARGS_VERSION}, currently using ${CPM_PACKAGE_VERSION})")
+    endif()
+    if (CPM_ARGS_OPTIONS)
+      foreach(OPTION ${CPM_ARGS_OPTIONS})
+        CPM_PARSE_OPTION(${OPTION})
+        if(NOT "${${OPTION_KEY}}" STREQUAL ${OPTION_VALUE})
+          message(WARNING "${CPM_INDENT} ignoring package option for ${CPM_ARGS_NAME}: ${OPTION_KEY} = ${OPTION_VALUE} (${${OPTION_KEY}})")
+        else()
+          message(STATUS "${CPM_INDENT} NOT ignoring package option for ${CPM_ARGS_NAME}: ${OPTION_KEY} = ${OPTION_VALUE} (${${OPTION_KEY}})")
+        endif()
+      endforeach()
+    endif()
+    CPM_FETCH_PACKAGE(${CPM_ARGS_NAME})
+    return()
+  endif()
+
+  CPM_REGISTER_PACKAGE(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION})
+
+  if (CPM_ARGS_OPTIONS)
+    foreach(OPTION ${CPM_ARGS_OPTIONS})
+      CPM_PARSE_OPTION(${OPTION})
+      set(${OPTION_KEY} ${OPTION_VALUE} CACHE INTERNAL "")
+    endforeach()
+  endif()
+
+  CPM_DECLARE_PACKAGE(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION} ${CPM_ARGS_GIT_TAG} "${CPM_ARGS_UNPARSED_ARGUMENTS}")
+  CPM_FETCH_PACKAGE(${CPM_ARGS_NAME})
 endfunction()
+
+function (CPM_DECLARE_PACKAGE PACKAGE VERSION GIT_TAG)
+  message(STATUS "${CPM_INDENT} adding package ${PACKAGE}@${VERSION} (${GIT_TAG})")
+
+  FetchContent_Declare(
+    ${PACKAGE}
+    GIT_TAG ${GIT_TAG}
+    ${ARGN}
+  )
+endfunction()
+
+function (CPM_FETCH_PACKAGE PACKAGE)  
+  set(CPM_OLD_INDENT "${CPM_INDENT}")
+  set(CPM_INDENT "${CPM_INDENT} ${PACKAGE}:")
+  FetchContent_MakeAvailable(${PACKAGE})
+  set(CPM_INDENT "${CPM_OLD_INDENT}")
+endfunction()
--- a/examples/complex/CMakeLists.txt
+++ b/examples/complex/CMakeLists.txt
@@ -14,29 +14,29 @@ CPMAddPackage(
  VERSION 0.7
 )

-# adding LHC again will be ignored as the package has already been added
+# will be ignored as newer version already added
 CPMAddPackage(
  NAME LHC
  GIT_REPOSITORY https://github.com/TheLartians/LHC.git
-  VERSION 0.1
+  VERSION 0.2
 )

 # language bindings
 # uses git tag instead of version identifier
-# depends on visitor library that depends on Event library and LHC (ignored as already added)
-# configuration arguments passed via OPTIONS. these will all be set internally
-set(GLUE_ENABLE_LUA ON)
+# depends on visitor library that depends on Event library and LHC
+# CMake configuration arguments passed via OPTIONS
 CPMAddPackage(
  NAME Glue
  GIT_TAG 78af65625751ad15a42ca52b842863e85b5d2adc
  GIT_REPOSITORY https://github.com/TheLartians/Glue.git
+  VERSION 0.5.1
  OPTIONS 
    "GLUE_ENABLE_LUA ON"
    "GLUE_BUILD_LUA ON"
 )

 # parser library 
-# depends on LHC (ignored as already added)
+# depends on LHC and Glue
 CPMAddPackage(
  NAME LarsParser
  GIT_REPOSITORY https://github.com/TheLartians/Parser.git