Mercurial > hg > orthanc

changeset 2453:c50413a4092c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
missing generated file in e2fsprogs
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 03 Jan 2018 15:40:34 +0100
parents 383337f21655
children 4f2474079fbf
files Resources/CMake/OrthancFrameworkConfiguration.cmake Resources/CMake/UuidConfiguration.cmake
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/OrthancFrameworkConfiguration.cmake	Wed Jan 03 15:17:12 2018 +0100
+++ b/Resources/CMake/OrthancFrameworkConfiguration.cmake	Wed Jan 03 15:40:34 2018 +0100
@@ -479,7 +479,6 @@
   ${BOOST_SOURCES}
   ${CIVETWEB_SOURCES}
   ${CURL_SOURCES}
-  ${E2FSPROGS_SOURCES}
   ${JSONCPP_SOURCES}
   ${LIBICONV_SOURCES}
   ${LIBJPEG_SOURCES}
@@ -490,6 +489,7 @@
   ${OPENSSL_SOURCES}
   ${PUGIXML_SOURCES}
   ${SQLITE_SOURCES}
+  ${UUID_SOURCES}
   ${ZLIB_SOURCES}
 
   ${ORTHANC_ROOT}/Resources/ThirdParty/md5/md5.c
--- a/Resources/CMake/UuidConfiguration.cmake	Wed Jan 03 15:17:12 2018 +0100
+++ b/Resources/CMake/UuidConfiguration.cmake	Wed Jan 03 15:40:34 2018 +0100
@@ -11,7 +11,7 @@
       ${E2FSPROGS_SOURCES_DIR}/lib
       )
 
-    set(E2FSPROGS_SOURCES
+    set(UUID_SOURCES
       #${E2FSPROGS_SOURCES_DIR}/lib/uuid/tst_uuid.c
       #${E2FSPROGS_SOURCES_DIR}/lib/uuid/uuid_time.c
       ${E2FSPROGS_SOURCES_DIR}/lib/uuid/clear.c
@@ -25,6 +25,8 @@
       ${E2FSPROGS_SOURCES_DIR}/lib/uuid/unparse.c
       )
 
+    file(WRITE ${E2FSPROGS_SOURCES_DIR}/lib/uuid/config.h "")
+    
     configure_file(
       ${E2FSPROGS_SOURCES_DIR}/lib/uuid/uuid.h.in
       ${E2FSPROGS_SOURCES_DIR}/lib/uuid/uuid.h
@@ -33,7 +35,7 @@
     file(WRITE
       ${E2FSPROGS_SOURCES_DIR}/lib/uuid/uuid_types.h
       "#include <stdint.h>\n")
-    
+
     #configure_file(
     #  ${E2FSPROGS_SOURCES_DIR}/lib/uuid/uuid_types.h.in
     #  ${E2FSPROGS_SOURCES_DIR}/lib/uuid/uuid_types.h