Revision: 55767
http://sourceforge.net/p/brlcad/code/55767
Author: starseeker
Date: 2013-06-13 21:32:17 +0000 (Thu, 13 Jun 2013)
Log Message:
-----------
The configure.cmake.sh script now becomes simply the configure script.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2013-06-13 20:02:39 UTC (rev 55766)
+++ brlcad/trunk/CMakeLists.txt 2013-06-13 21:32:17 UTC (rev 55767)
@@ -2277,15 +2277,15 @@
file(APPEND ${CMAKE_BINARY_DIR}/configure.new "${CONFIG_SUFFIX}")
# Compare
execute_process(COMMAND ${CMAKE_COMMAND} -E compare_files
- ${BRLCAD_SOURCE_DIR}/configure.cmake.sh ${BRLCAD_BINARY_DIR}/configure.new
+ ${BRLCAD_SOURCE_DIR}/configure ${BRLCAD_BINARY_DIR}/configure.new
RESULT_VARIABLE IS_CONFIG_SH_DIFFERENT OUTPUT_VARIABLE DIFF_OUTPUT
ERROR_VARIABLE
DIFF_ERROR)
if(IS_CONFIG_SH_DIFFERENT)
if(LOCKED_SOURCE_DIR)
- message(WARNING "\n${BRLCAD_SOURCE_DIR}/configure.cmake.sh is out of date.
An updated version has been generated at ${BRLCAD_BINARY_DIR}/configure.new\nTo
clear this warning, replace ${BRLCAD_SOURCE_DIR}/configure.cmake.sh with
${BRLCAD_BINARY_DIR}/configure.new\n")
+ message(WARNING "\n${BRLCAD_SOURCE_DIR}/configure is out of date. An
updated version has been generated at ${BRLCAD_BINARY_DIR}/configure.new\nTo
clear this warning, replace ${BRLCAD_SOURCE_DIR}/configure with
${BRLCAD_BINARY_DIR}/configure.new\n")
else(LOCKED_SOURCE_DIR)
set_source_files_properties(${BRLCAD_BINARY_DIR}/configure.new PROPERTIES
GENERATED TRUE)
- configure_file(${BRLCAD_BINARY_DIR}/configure.new
${BRLCAD_SOURCE_DIR}/configure.cmake.sh COPYONLY)
+ configure_file(${BRLCAD_BINARY_DIR}/configure.new
${BRLCAD_SOURCE_DIR}/configure COPYONLY)
endif(LOCKED_SOURCE_DIR)
endif(IS_CONFIG_SH_DIFFERENT)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
