Revision: 70807
          http://sourceforge.net/p/brlcad/code/70807
Author:   starseeker
Date:     2018-03-07 21:03:08 +0000 (Wed, 07 Mar 2018)
Log Message:
-----------
Restore (currently) needed CMAKEFILES calls, put check back in distcheck but 
fix the FORCE_DISTCHECK setting (needs to get the setting from configure_file 
since distcheck_repo_verify isn't run directly by the user.)

Modified Paths:
--------------
    brlcad/trunk/include/CMakeLists.txt
    brlcad/trunk/misc/CMake/distcheck_repo_verify.cmake.in

Modified: brlcad/trunk/include/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/CMakeLists.txt 2018-03-06 06:56:30 UTC (rev 70806)
+++ brlcad/trunk/include/CMakeLists.txt 2018-03-07 21:03:08 UTC (rev 70807)
@@ -46,6 +46,7 @@
   wdb.h
   )
 install(FILES ${public_hdrs} DESTINATION ${INCLUDE_DIR}/brlcad)
+CMAKEFILES(${public_hdrs})
 
 # Configuration headers
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/brlcad_config.h" DESTINATION 
${INCLUDE_DIR}/brlcad)
@@ -55,6 +56,7 @@
 
 # Used by others but still considered private
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/brlcad_version.h" DESTINATION 
${INCLUDE_DIR})
+CMAKEFILES(brlcad_version.h)
 
 # Enforce the above list - check the public headers to make sure
 # they do not include any private headers.

Modified: brlcad/trunk/misc/CMake/distcheck_repo_verify.cmake.in
===================================================================
--- brlcad/trunk/misc/CMake/distcheck_repo_verify.cmake.in      2018-03-06 
06:56:30 UTC (rev 70806)
+++ brlcad/trunk/misc/CMake/distcheck_repo_verify.cmake.in      2018-03-07 
21:03:08 UTC (rev 70807)
@@ -219,6 +219,14 @@
     message("\nFiles mentioned in build logic are not checked into the 
repository: \n${BUILD_FILES_NOT_IN_SVN}\n")
   endif(BUILD_FILES_NOT_IN_SVN)
 
+  # Either of the previous two cases halts distcheck until fixed.
+  set(FORCE_DISTCHECK @FORCE_DISTCHECK@)
+  if (SVN_FILES_NOT_IN_BUILD OR BUILD_FILES_NOT_IN_SVN)
+    if (NOT FORCE_DISTCHECK)
+      message(FATAL_ERROR "ERROR: Distcheck cannot proceed until build files 
and repo are in sync (set -DFORCE_DISTCHECK=ON to override)")
+    endif (NOT FORCE_DISTCHECK)
+  endif (SVN_FILES_NOT_IN_BUILD OR BUILD_FILES_NOT_IN_SVN)
+
 endif(SVN_EXEC AND EXISTS "@CMAKE_SOURCE_DIR@/.svn")
 
 set(IGNORED_FS_FILES ${FS_FILE_LIST})

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to