Revision: 69942
http://sourceforge.net/p/brlcad/code/69942
Author: starseeker
Date: 2017-07-13 21:44:54 +0000 (Thu, 13 Jul 2017)
Log Message:
-----------
Tweak astyle validation logic
Modified Paths:
--------------
brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
brlcad/trunk/src/libbu/CMakeLists.txt
Modified: brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2017-07-05 18:08:54 UTC
(rev 69941)
+++ brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2017-07-13 21:44:54 UTC
(rev 69942)
@@ -158,11 +158,14 @@
if(BRLCAD_STYLE_VALIDATE)
set(fullpath_srcslist)
foreach(srcfile ${srcslist})
- get_property(IGNORE_FILE SOURCE ${srcfile} PROPERTY EXTERNAL DEFINED)
- message("${srcfile} external: ${IGNORE_FILE}")
- if(NOT IGNORE_FILE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${srcfile}")
- set(fullpath_srcslist ${fullpath_srcslist}
"${CMAKE_CURRENT_SOURCE_DIR}/${srcfile}")
- endif(NOT IGNORE_FILE AND EXISTS
"${CMAKE_CURRENT_SOURCE_DIR}/${srcfile}")
+ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${srcfile}")
+ get_property(IGNORE_FILE SOURCE ${srcfile} PROPERTY EXTERNAL )
+ if(IGNORE_FILE)
+ message("Note: ignoring external file ${srcfile}")
+ else(IGNORE_FILE)
+ set(fullpath_srcslist ${fullpath_srcslist}
"${CMAKE_CURRENT_SOURCE_DIR}/${srcfile}")
+ endif(IGNORE_FILE)
+ endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${srcfile}")
endforeach(srcfile ${srcslist})
if(fullpath_srcslist)
Modified: brlcad/trunk/src/libbu/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbu/CMakeLists.txt 2017-07-05 18:08:54 UTC (rev
69941)
+++ brlcad/trunk/src/libbu/CMakeLists.txt 2017-07-13 21:44:54 UTC (rev
69942)
@@ -35,6 +35,7 @@
install(FILES ${BU_MIME_H_FILE} DESTINATION ${INCLUDE_DIR}/brlcad/bu)
# Year 2038+ support lib
+set_property(SOURCE y2038/time64.c PROPERTY EXTERNAL 1)
BRLCAD_ADDLIB(y2038 "y2038/time64.c" "")
if(CPP_DLL_DEFINES)
set_property(TARGET y2038 APPEND PROPERTY COMPILE_DEFINITIONS
"Y2038_DLL_EXPORTS")
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
