dont use global include dir

cget/cli.py

@@ -56,7 +56,8 @@ def w(obj, prefix, verbose, build_path, *args, **kwargs):
 @click.option('-D', '--define', multiple=True, help="Extra configuration variables to pass to CMake")
 @click.option('--shared', is_flag=True, help="Set toolchain to build shared libraries by default")
 @click.option('--static', is_flag=True, help="Set toolchain to build static libraries by default")
-def init_command(prefix, toolchain, cc, cxx, cflags, cxxflags, ldflags, std, define, shared, static):
+@click.option('--no-global-include', is_flag=True, help="Don't use global include dir (required for -X header)")
+def init_command(prefix, toolchain, cc, cxx, cflags, cxxflags, ldflags, std, define, shared, static, no_global_include):
     """ Initialize install directory """
     if shared and static:
         click.echo("ERROR: shared and static are not supported together")
@@ -73,7 +74,9 @@ def init_command(prefix, toolchain, cc, cxx, cflags, cxxflags, ldflags, std, def
         cxxflags=cxxflags, 
         ldflags=ldflags, 
         std=std, 
-        defines=defines)
+        defines=defines,
+        no_global_include=no_global_include
+    )
 
 @cli.command(name='install')
 @use_prefix
@@ -87,8 +90,10 @@ def init_command(prefix, toolchain, cc, cxx, cflags, cxxflags, ldflags, std, def
 @click.option('--debug', is_flag=True, help="Install debug version")
 @click.option('--release', is_flag=True, help="Install release version")
 @click.option('--insecure', is_flag=True, help="Don't use https urls")
+@click.option('--use-build-cache', is_flag=True, help="Cache builds")
+@click.option('--recipe-deps-only', is_flag=True, help="only use dependencies from recipes (speeds up cached builds a lot)")
 @click.argument('pkgs', nargs=-1, type=click.STRING)
-def install_command(prefix, pkgs, define, file, test, test_all, update, generator, cmake, debug, release, insecure):
+def install_command(prefix, pkgs, define, file, test, test_all, update, generator, cmake, debug, release, insecure, use_build_cache, recipe_deps_only):
     """ Install packages """
     if debug and release:
         click.echo("ERROR: debug and release are not supported together")
@@ -102,7 +107,16 @@ def install_command(prefix, pkgs, define, file, test, test_all, update, generato
     for pbu in util.flat([prefix.from_file(file), pbs]):
         pb = pbu.merge_defines(define)
         with prefix.try_("Failed to build package {}".format(pb.to_name()), on_fail=lambda: prefix.remove(pb)):
-            click.echo(prefix.install(pb, test=test, test_all=test_all, update=update, generator=generator, insecure=insecure))
+            click.echo(prefix.install(
+                pb,
+                test=test,
+                test_all=test_all,
+                update=update,
+                generator=generator,
+                insecure=insecure,
+                use_build_cache=use_build_cache,
+                recipe_deps_only=recipe_deps_only
+            ))
 
 @cli.command(name='ignore')
 @use_prefix

cget/cmake/autotools.cmake

@@ -60,14 +60,6 @@ macro(preamble PREFIX)
     endforeach()
     adjust_path(${PREFIX}_SYSTEM_PATH)
 
-    set(${PREFIX}_PKG_CONFIG_PATH)
-    foreach(P ${PREFIX_PATH} ${PREFIX_SYSTEM_PATH})
-        foreach(SUFFIX lib lib${${PREFIX}_ADDRESS_MODEL} share)
-            list(APPEND ${PREFIX}_PKG_CONFIG_PATH ${P}/${SUFFIX}/pkgconfig)
-        endforeach()
-    endforeach()
-    adjust_path(${PREFIX}_PKG_CONFIG_PATH)
-
     get_property_list(${PREFIX}_COMPILE_FLAGS COMPILE_OPTIONS)
     get_directory_property(${PREFIX}_INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES)
     foreach(DIR ${${PREFIX}_INCLUDE_DIRECTORIES})
@@ -86,11 +78,12 @@ macro(preamble PREFIX)
         endif()
     endforeach()
     get_directory_property(${PREFIX}_LINK_DIRECTORIES LINK_DIRECTORIES)
+    get_property_list(${PREFIX}_LINK_FLAGS LINK_FLAGS)
     foreach(LIB_DIR ${${PREFIX}_LINK_DIRECTORIES})
         if(MSVC)
             string(APPEND ${PREFIX}_LINK_FLAGS " /LIBPATH:${LIB_DIR}")
         else()
-            string(APPEND ${PREFIX}_LINK_FLAGS " -L ${LIB_DIR}")
+            string(APPEND ${PREFIX}_LINK_FLAGS " -L${LIB_DIR}")
         endif()
     endforeach()
 
@@ -112,13 +105,11 @@ macro(preamble PREFIX)
         set(${PREFIX}_LINK_FLAGS "${${PREFIX}_LINK_FLAGS} -isysroot ${CMAKE_OSX_SYSROOT}")
     endif (APPLE)
 
-    get_property_list(${PREFIX}_LINK_FLAGS LINK_FLAGS)
     if(BUILD_SHARED_LIBS)
         string(APPEND ${PREFIX}_LINK_FLAGS " ${CMAKE_SHARED_LINKER_FLAGS}")
     else()
         string(APPEND ${PREFIX}_LINK_FLAGS " ${CMAKE_STATIC_LINKER_FLAGS}")
     endif()
-    get_property_list(${PREFIX}_LINK_FLAGS LINK_FLAGS)
 
     foreach(LANG C CXX)
         foreach(DIR ${CMAKE_${LANG}_STANDARD_INCLUDE_DIRECTORIES})
@@ -146,14 +137,8 @@ macro(preamble PREFIX)
 
     set(${PREFIX}_BASE_ENV_COMMAND ${CMAKE_COMMAND} -E env
         "PATH=${${PREFIX}_SYSTEM_PATH}${PATH_SEP}$ENV{PATH}"
-        "PKG_CONFIG_PATH=${${PREFIX}_PKG_CONFIG_PATH}"
     )
 
-    # TODO: Set also PKG_CONFIG_SYSROOT_DIR
-    if(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE STREQUAL "ONLY")
-        list(APPEND ${PREFIX}_BASE_ENV_COMMAND "PKG_CONFIG_LIBDIR=${${PREFIX}_PKG_CONFIG_PATH}")
-    endif()
-
     set(${PREFIX}_ENV_COMMAND ${${PREFIX}_BASE_ENV_COMMAND}
         "CC=${CMAKE_C_COMPILER}"
         "CXX=${CMAKE_CXX_COMPILER}"
@@ -181,7 +166,19 @@ list(APPEND CONFIGURE_OPTIONS
 )
 endif()
 
-execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/configure --help OUTPUT_VARIABLE AUTOTOOLS_AVAILABLE_OPTIONS)
+
+set(AUTOTOOLS_RUN_AUTOGEN_SH Off CACHE BOOL "")
+if (AUTOTOOLS_RUN_AUTOGEN_SH)
+    execute_process(
+        COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/autogen.sh
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+endif (AUTOTOOLS_RUN_AUTOGEN_SH)
+
+execute_process(
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/configure --help
+  OUTPUT_VARIABLE AUTOTOOLS_AVAILABLE_OPTIONS
+)
 
 if(AUTOTOOLS_AVAILABLE_OPTIONS MATCHES "--disable-option-checking")
     set(AUTOTOOL_IMPLICIT_CONFIGURE_OPTIONS On CACHE BOOL "")
@@ -200,6 +197,7 @@ if(AUTOTOOL_IMPLICIT_CONFIGURE_OPTIONS)
     endif()
 endif()
 
+
 message(STATUS "Configure options: ${CONFIGURE_OPTIONS}")
 
 # TODO: Check flags of configure script

cget/cmake/boost.cmake

@@ -53,14 +53,6 @@ macro(preamble PREFIX)
     endforeach()
     adjust_path(${PREFIX}_SYSTEM_PATH)
 
-    set(${PREFIX}_PKG_CONFIG_PATH)
-    foreach(P ${PREFIX_PATH} ${PREFIX_SYSTEM_PATH})
-        foreach(SUFFIX lib lib${${PREFIX}_ADDRESS_MODEL} share)
-            list(APPEND ${PREFIX}_PKG_CONFIG_PATH ${P}/${SUFFIX}/pkgconfig)
-        endforeach()
-    endforeach()
-    adjust_path(${PREFIX}_PKG_CONFIG_PATH)
-
     get_property_list(${PREFIX}_COMPILE_FLAGS COMPILE_OPTIONS)
     get_directory_property(${PREFIX}_INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES)
     foreach(DIR ${${PREFIX}_INCLUDE_DIRECTORIES})
@@ -79,11 +71,12 @@ macro(preamble PREFIX)
         endif()
     endforeach()
     get_directory_property(${PREFIX}_LINK_DIRECTORIES LINK_DIRECTORIES)
+    get_property_list(${PREFIX}_LINK_FLAGS LINK_FLAGS)
     foreach(LIB_DIR ${${PREFIX}_LINK_DIRECTORIES})
         if(MSVC)
             string(APPEND ${PREFIX}_LINK_FLAGS " /LIBPATH:${LIB_DIR}")
         else()
-            string(APPEND ${PREFIX}_LINK_FLAGS " -L ${LIB_DIR}")
+            string(APPEND ${PREFIX}_LINK_FLAGS " -L${LIB_DIR}")
         endif()
     endforeach()
 
@@ -105,13 +98,11 @@ macro(preamble PREFIX)
         set(${PREFIX}_LINK_FLAGS "${${PREFIX}_LINK_FLAGS} -isysroot ${CMAKE_OSX_SYSROOT}")
     endif (APPLE)
 
-    get_property_list(${PREFIX}_LINK_FLAGS LINK_FLAGS)
     if(BUILD_SHARED_LIBS)
         string(APPEND ${PREFIX}_LINK_FLAGS " ${CMAKE_SHARED_LINKER_FLAGS}")
     else()
         string(APPEND ${PREFIX}_LINK_FLAGS " ${CMAKE_STATIC_LINKER_FLAGS}")
     endif()
-    get_property_list(${PREFIX}_LINK_FLAGS LINK_FLAGS)
 
     foreach(LANG C CXX)
         foreach(DIR ${CMAKE_${LANG}_STANDARD_INCLUDE_DIRECTORIES})
@@ -139,14 +130,8 @@ macro(preamble PREFIX)
 
     set(${PREFIX}_BASE_ENV_COMMAND ${CMAKE_COMMAND} -E env
         "PATH=${${PREFIX}_SYSTEM_PATH}${PATH_SEP}$ENV{PATH}"
-        "PKG_CONFIG_PATH=${${PREFIX}_PKG_CONFIG_PATH}"
     )
 
-    # TODO: Set also PKG_CONFIG_SYSROOT_DIR
-    if(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE STREQUAL "ONLY")
-        list(APPEND ${PREFIX}_BASE_ENV_COMMAND "PKG_CONFIG_LIBDIR=${${PREFIX}_PKG_CONFIG_PATH}")
-    endif()
-
     set(${PREFIX}_ENV_COMMAND ${${PREFIX}_BASE_ENV_COMMAND}
         "CC=${CMAKE_C_COMPILER}"
         "CXX=${CMAKE_CXX_COMPILER}"
@@ -234,24 +219,40 @@ using ${BOOST_TOOLCHAIN} : ${B2_TOOLCHAIN_VERSION} : \"${B2_COMPILER}\" :
 ${SEARCH_PATHS}
 ;
 ")
+
+set(BOOST_PYTHON "" CACHE STRING "python executable to use for boost build")
+set(BOOST_BOOTSTRAP_ARGS "" CACHE STRING "additional arguments to boost bootstrap")
+
+if (BOOST_PYTHON)
+    find_program(BOOST_PYTHON_FOUND ${BOOST_PYTHON} REQUIRED)
+    get_filename_component(BOOST_PYTHON_FOUND_REAL "${BOOST_PYTHON_FOUND}" REALPATH)
+    message(STATUS "found python: '${BOOST_PYTHON_FOUND}' -> '${BOOST_PYTHON_FOUND_REAL}'")
+    set(B2_CONFIG_CONTENT "${B2_CONFIG_CONTENT}
+    using python : : ${BOOST_PYTHON_FOUND_REAL} ;
+    ")
+endif (BOOST_PYTHON)
+
 message("${B2_CONFIG_CONTENT}")
 
 file(WRITE ${B2_CONFIG} "${B2_CONFIG_CONTENT}")
 
 find_program(B2_EXE b2)
 if(NOT ${B2_EXE})
+    if (BOOST_PYTHON)
+        set(BOOST_BOOTSTRAP_PYTHON_ARG "--with-python=${BOOST_PYTHON_FOUND_REAL}")
+    endif (BOOST_PYTHON)
     if(CMAKE_HOST_WIN32)
         add_custom_target(bootstrap
-            COMMAND cmd /c ${CMAKE_CURRENT_SOURCE_DIR}/tools/build/bootstrap.bat
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tools/build/
+            COMMAND cmd /c ${CMAKE_CURRENT_SOURCE_DIR}/bootstrap.bat ${BOOST_BOOTSTRAP_ARGS} ${BOOST_BOOTSTRAP_PYTHON_ARG}
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         )
         set(B2_EXE "${CMAKE_CURRENT_SOURCE_DIR}/tools/build/b2.exe")
     else()
         add_custom_target(bootstrap
-            COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools/build/bootstrap.sh
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tools/build/
+            COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bootstrap.sh ${BOOST_BOOTSTRAP_ARGS} ${BOOST_BOOTSTRAP_PYTHON_ARG}
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         )
-        set(B2_EXE "${CMAKE_CURRENT_SOURCE_DIR}/tools/build/b2")
+        set(B2_EXE "${CMAKE_CURRENT_SOURCE_DIR}/b2")
     endif()
     install(PROGRAMS ${B2_EXE} DESTINATION bin)
 endif()

cget/cmake/make.cmake

@@ -58,14 +58,6 @@ macro(preamble PREFIX)
     endforeach()
     adjust_path(${PREFIX}_SYSTEM_PATH)
 
-    set(${PREFIX}_PKG_CONFIG_PATH)
-    foreach(P ${PREFIX_PATH} ${PREFIX_SYSTEM_PATH})
-        foreach(SUFFIX lib lib${${PREFIX}_ADDRESS_MODEL} share)
-            list(APPEND ${PREFIX}_PKG_CONFIG_PATH ${P}/${SUFFIX}/pkgconfig)
-        endforeach()
-    endforeach()
-    adjust_path(${PREFIX}_PKG_CONFIG_PATH)
-
     get_property_list(${PREFIX}_COMPILE_FLAGS COMPILE_OPTIONS)
     get_directory_property(${PREFIX}_INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES)
     foreach(DIR ${${PREFIX}_INCLUDE_DIRECTORIES})
@@ -84,11 +76,12 @@ macro(preamble PREFIX)
         endif()
     endforeach()
     get_directory_property(${PREFIX}_LINK_DIRECTORIES LINK_DIRECTORIES)
+    get_property_list(${PREFIX}_LINK_FLAGS LINK_FLAGS)
     foreach(LIB_DIR ${${PREFIX}_LINK_DIRECTORIES})
         if(MSVC)
             string(APPEND ${PREFIX}_LINK_FLAGS " /LIBPATH:${LIB_DIR}")
         else()
-            string(APPEND ${PREFIX}_LINK_FLAGS " -L ${LIB_DIR}")
+            string(APPEND ${PREFIX}_LINK_FLAGS " -L${LIB_DIR}")
         endif()
     endforeach()
 
@@ -110,13 +103,11 @@ macro(preamble PREFIX)
         set(${PREFIX}_LINK_FLAGS "${${PREFIX}_LINK_FLAGS} -isysroot ${CMAKE_OSX_SYSROOT}")
     endif (APPLE)
 
-    get_property_list(${PREFIX}_LINK_FLAGS LINK_FLAGS)
     if(BUILD_SHARED_LIBS)
         string(APPEND ${PREFIX}_LINK_FLAGS " ${CMAKE_SHARED_LINKER_FLAGS}")
     else()
         string(APPEND ${PREFIX}_LINK_FLAGS " ${CMAKE_STATIC_LINKER_FLAGS}")
     endif()
-    get_property_list(${PREFIX}_LINK_FLAGS LINK_FLAGS)
 
     foreach(LANG C CXX)
         foreach(DIR ${CMAKE_${LANG}_STANDARD_INCLUDE_DIRECTORIES})
@@ -144,14 +135,8 @@ macro(preamble PREFIX)
 
     set(${PREFIX}_BASE_ENV_COMMAND ${CMAKE_COMMAND} -E env
         "PATH=${${PREFIX}_SYSTEM_PATH}${PATH_SEP}$ENV{PATH}"
-        "PKG_CONFIG_PATH=${${PREFIX}_PKG_CONFIG_PATH}"
     )
 
-    # TODO: Set also PKG_CONFIG_SYSROOT_DIR
-    if(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE STREQUAL "ONLY")
-        list(APPEND ${PREFIX}_BASE_ENV_COMMAND "PKG_CONFIG_LIBDIR=${${PREFIX}_PKG_CONFIG_PATH}")
-    endif()
-
     set(${PREFIX}_ENV_COMMAND ${${PREFIX}_BASE_ENV_COMMAND}
         "CC=${CMAKE_C_COMPILER}"
         "CXX=${CMAKE_CXX_COMPILER}"

cget/cmake/meson.cmake

@@ -87,14 +87,6 @@ macro(preamble PREFIX)
     endforeach()
     adjust_path(${PREFIX}_SYSTEM_PATH)
 
-    set(${PREFIX}_PKG_CONFIG_PATH)
-    foreach(P ${PREFIX_PATH} ${PREFIX_SYSTEM_PATH})
-        foreach(SUFFIX lib lib${${PREFIX}_ADDRESS_MODEL} share)
-            list(APPEND ${PREFIX}_PKG_CONFIG_PATH ${P}/${SUFFIX}/pkgconfig)
-        endforeach()
-    endforeach()
-    adjust_path(${PREFIX}_PKG_CONFIG_PATH)
-
     get_property_list(${PREFIX}_COMPILE_FLAGS COMPILE_OPTIONS)
     get_directory_property(${PREFIX}_INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES)
     foreach(DIR ${${PREFIX}_INCLUDE_DIRECTORIES})
@@ -113,11 +105,12 @@ macro(preamble PREFIX)
         endif()
     endforeach()
     get_directory_property(${PREFIX}_LINK_DIRECTORIES LINK_DIRECTORIES)
+    get_property_list(${PREFIX}_LINK_FLAGS LINK_FLAGS)
     foreach(LIB_DIR ${${PREFIX}_LINK_DIRECTORIES})
         if(MSVC)
             string(APPEND ${PREFIX}_LINK_FLAGS " /LIBPATH:${LIB_DIR}")
         else()
-            string(APPEND ${PREFIX}_LINK_FLAGS " -L ${LIB_DIR}")
+            string(APPEND ${PREFIX}_LINK_FLAGS " -L${LIB_DIR}")
         endif()
     endforeach()
 
@@ -139,13 +132,11 @@ macro(preamble PREFIX)
         set(${PREFIX}_LINK_FLAGS "${${PREFIX}_LINK_FLAGS} -isysroot ${CMAKE_OSX_SYSROOT}")
     endif (APPLE)
 
-    get_property_list(${PREFIX}_LINK_FLAGS LINK_FLAGS)
     if(BUILD_SHARED_LIBS)
         string(APPEND ${PREFIX}_LINK_FLAGS " ${CMAKE_SHARED_LINKER_FLAGS}")
     else()
         string(APPEND ${PREFIX}_LINK_FLAGS " ${CMAKE_STATIC_LINKER_FLAGS}")
     endif()
-    get_property_list(${PREFIX}_LINK_FLAGS LINK_FLAGS)
 
     foreach(LANG C CXX)
         foreach(DIR ${CMAKE_${LANG}_STANDARD_INCLUDE_DIRECTORIES})
@@ -173,14 +164,8 @@ macro(preamble PREFIX)
 
     set(${PREFIX}_BASE_ENV_COMMAND ${CMAKE_COMMAND} -E env
         "PATH=${${PREFIX}_SYSTEM_PATH}${PATH_SEP}$ENV{PATH}"
-        "PKG_CONFIG_PATH=${${PREFIX}_PKG_CONFIG_PATH}"
     )
 
-    # TODO: Set also PKG_CONFIG_SYSROOT_DIR
-    if(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE STREQUAL "ONLY")
-        list(APPEND ${PREFIX}_BASE_ENV_COMMAND "PKG_CONFIG_LIBDIR=${${PREFIX}_PKG_CONFIG_PATH}")
-    endif()
-
     set(${PREFIX}_ENV_COMMAND ${${PREFIX}_BASE_ENV_COMMAND}
         "CC=${CMAKE_C_COMPILER}"
         "CXX=${CMAKE_CXX_COMPILER}"

cget/package.py

@@ -1,4 +1,4 @@
-import base64, copy, argparse, six
+import base64, copy, argparse, six, dirhash, hashlib
 
 def encode_url(url):
     x = six.b(url[url.find('://')+3:])
@@ -31,6 +31,12 @@ def get_src_dir(self):
             return self.url[7:] # Remove "file://"
         raise TypeError()
 
+    def calc_hash(self):
+        if self.recipe:
+            return dirhash.dirhash(self.recipe, "sha1")
+        elif self.url:
+            return hashlib.sha1(self.url.encode("utf-8")).hexdigest()
+        raise Exception("no url or recipe: %s" % self.__dict__)
 
 def fname_to_pkg(fname):
     if fname.startswith('_url_'): return PackageSource(name=decode_url(fname), fname=fname)