tags 890568 + patch
thanks
Hi Aaron,
> In the course of making dashelConfig.cmake reproducible, you
> inadvertently broke it altogether. Builds of aseba against
> libdashel-dev 1.3.3-4 [1][2] have been failing
Really sorry about that. Updated patch (also attached):
--- dashel-1.3.3.orig/dashelConfig.cmake.in
+++ dashel-1.3.3/dashelConfig.cmake.in
@@ -42,8 +42,8 @@ else (WIN32)
endif (WIN32)
# Standard search
-find_path(dashel_INCLUDE_DIRS dashel/dashel.h @PROJECT_SOURCE_DIR@
CMAKE_FIND_ROOT_PATH_BOTH)
-find_library(dashel_LIBRARY dashel @PROJECT_BINARY_DIR@
CMAKE_FIND_ROOT_PATH_BOTH)
+find_path(dashel_INCLUDE_DIRS dashel/dashel.h CMAKE_FIND_ROOT_PATH_BOTH)
+find_library(dashel_LIBRARY dashel CMAKE_FIND_ROOT_PATH_BOTH)
set(dashel_LIBRARIES ${dashel_LIBRARY} ${EXTRA_LIBS})
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(dashel DEFAULT_MSG dashel_LIBRARIES
dashel_INCLUDE_DIRS)
I can confirm this then builds with aseba.
Best wishes,
--
,''`.
: :' : Chris Lamb
`. `'` [email protected] / chris-lamb.co.uk
`-
Description: Make the build reproducible
Author: Chris Lamb <[email protected]>
Last-Update: 2018-02-16
--- dashel-1.3.3.orig/dashelConfig.cmake.in
+++ dashel-1.3.3/dashelConfig.cmake.in
@@ -42,8 +42,8 @@ else (WIN32)
endif (WIN32)
# Standard search
-find_path(dashel_INCLUDE_DIRS dashel/dashel.h @PROJECT_SOURCE_DIR@ CMAKE_FIND_ROOT_PATH_BOTH)
-find_library(dashel_LIBRARY dashel @PROJECT_BINARY_DIR@ CMAKE_FIND_ROOT_PATH_BOTH)
+find_path(dashel_INCLUDE_DIRS dashel/dashel.h CMAKE_FIND_ROOT_PATH_BOTH)
+find_library(dashel_LIBRARY dashel CMAKE_FIND_ROOT_PATH_BOTH)
set(dashel_LIBRARIES ${dashel_LIBRARY} ${EXTRA_LIBS})
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(dashel DEFAULT_MSG dashel_LIBRARIES dashel_INCLUDE_DIRS)
