Revision: 70000
http://sourceforge.net/p/brlcad/code/70000
Author: starseeker
Date: 2017-07-26 20:47:51 +0000 (Wed, 26 Jul 2017)
Log Message:
-----------
Provide executable extensions based on CMAKE_COMMAND
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/misc/CMake/BRLCAD_Util.cmake
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2017-07-26 20:19:07 UTC (rev 69999)
+++ brlcad/trunk/CMakeLists.txt 2017-07-26 20:47:51 UTC (rev 70000)
@@ -139,6 +139,9 @@
# Load general utility routines for BRL-CAD CMake logic
include("${CMAKE_SOURCE_DIR}/misc/CMake/BRLCAD_Util.cmake")
+# Find the executable extension, if there is one
+get_filename_component(EXE_EXT "${CMAKE_COMMAND}" EXT)
+
#---------------------------------------------------------------------
# Record the CMake command line arguments (more or less) in
# CMakeFiles/CMakeOutput.log
@@ -153,7 +156,7 @@
#---------------------------------------------------------------------
# Mark the time at which the configuration process began.
set(CONFIG_DELTA_START "${CMAKE_BINARY_DIR}/CMakeTmp/CONFIG_DELTA_START")
-execute_process(COMMAND "${CMAKE_BINARY_DIR}/CMakeTmp/sstamp"
"${CONFIG_DELTA_START}")
+execute_process(COMMAND "${CMAKE_BINARY_DIR}/CMakeTmp/sstamp${EXE_EXT}"
"${CONFIG_DELTA_START}")
#---------------------------------------------------------------------
# Allow the BRLCAD_ROOT environment variable to set CMAKE_INSTALL_PREFIX
@@ -2817,16 +2820,16 @@
add_custom_command(
OUTPUT ${BUILD_DELTA_START}
- COMMAND ${CMAKE_BINARY_DIR}/CMakeTmp/sstamp "${BUILD_DELTA_START}"
+ COMMAND ${CMAKE_BINARY_DIR}/CMakeTmp/sstamp${EXE_EXT}
"${BUILD_DELTA_START}"
COMMENT ""
)
add_custom_target(timestamp ALL
- COMMAND ${CMAKE_BINARY_DIR}/CMakeTmp/pts \"Build Time: \"
+ COMMAND ${CMAKE_BINARY_DIR}/CMakeTmp/pts${EXE_EXT} \"Build Time: \"
DEPENDS ${BUILD_DELTA_START}
)
set_target_properties(timestamp PROPERTIES FOLDER "Compilation Utilities")
add_custom_target(buildtimedelta ALL
- COMMAND ${CMAKE_BINARY_DIR}/CMakeTmp/dreport final ${BUILD_DELTA_START}
${CONFIG_DELTA_START}
+ COMMAND ${CMAKE_BINARY_DIR}/CMakeTmp/dreport${EXE_EXT} final
${BUILD_DELTA_START} ${CONFIG_DELTA_START}
COMMAND ${CMAKE_COMMAND} -E remove ${BUILD_DELTA_START}
)
set_target_properties(buildtimedelta PROPERTIES FOLDER "Compilation
Utilities")
Modified: brlcad/trunk/misc/CMake/BRLCAD_Util.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Util.cmake 2017-07-26 20:19:07 UTC (rev
69999)
+++ brlcad/trunk/misc/CMake/BRLCAD_Util.cmake 2017-07-26 20:47:51 UTC (rev
70000)
@@ -543,7 +543,7 @@
try_compile(rfc2822_build "${CMAKE_BINARY_DIR}/CMakeTmp"
SOURCES "${CMAKE_BINARY_DIR}/CMakeTmp/rfc2822.c"
OUTPUT_VARIABLE RFC2822_BUILD_INFO
- COPY_FILE "${CMAKE_BINARY_DIR}/CMakeTmp/rfc2822")
+ COPY_FILE "${CMAKE_BINARY_DIR}/CMakeTmp/rfc2822${EXE_EXT}")
if(NOT rfc2822_build)
message(FATAL_ERROR "Could not build rfc2822 timestamp pretty-printing
utility: ${RFC2822_BUILD_INFO}")
endif(NOT rfc2822_build)
@@ -596,7 +596,7 @@
file(WRITE "${CMAKE_BINARY_DIR}/CMakeTmp/printtimestamp.c"
"${printtimestamp_src}")
try_compile(pts_build ${CMAKE_BINARY_DIR}/CMakeTmp
"${CMAKE_BINARY_DIR}/CMakeTmp/printtimestamp.c"
- COPY_FILE ${CMAKE_BINARY_DIR}/CMakeTmp/pts)
+ COPY_FILE ${CMAKE_BINARY_DIR}/CMakeTmp/pts${EXE_EXT})
if(NOT pts_build)
message(FATAL_ERROR "Could not build timestamp pretty-printing utility")
endif(NOT pts_build)
@@ -628,7 +628,7 @@
try_compile(sstamp_build "${CMAKE_BINARY_DIR}/CMakeTmp"
SOURCES "${CMAKE_BINARY_DIR}/CMakeTmp/sstamp.c"
OUTPUT_VARIABLE SSTAMP_BUILD_INFO
- COPY_FILE "${CMAKE_BINARY_DIR}/CMakeTmp/sstamp")
+ COPY_FILE "${CMAKE_BINARY_DIR}/CMakeTmp/sstamp${EXE_EXT}")
if(NOT sstamp_build)
message(FATAL_ERROR "Could not build second timestamping utility:
${SSTAMP_BUILD_INFO}")
endif(NOT sstamp_build)
@@ -708,7 +708,7 @@
try_compile(dreport_build "${CMAKE_BINARY_DIR}/CMakeTmp"
SOURCES "${CMAKE_BINARY_DIR}/CMakeTmp/dreport.c"
OUTPUT_VARIABLE FREPORT_BUILD_INFO
- COPY_FILE "${CMAKE_BINARY_DIR}/CMakeTmp/dreport")
+ COPY_FILE "${CMAKE_BINARY_DIR}/CMakeTmp/dreport${EXE_EXT}")
if(NOT dreport_build)
message(FATAL_ERROR "Could not build time delta reporting utility:
${FREPORT_BUILD_INFO}")
endif(NOT dreport_build)
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
