Revision: 75945
http://sourceforge.net/p/brlcad/code/75945
Author: starseeker
Date: 2020-05-27 01:14:01 +0000 (Wed, 27 May 2020)
Log Message:
-----------
CMAKE_EXECUTABLE_SUFFIX appears to be empty with cmake -P on Windows - try a
different approach
Modified Paths:
--------------
brlcad/branches/bioh/regress/gcv/fastgen/regress-fastgen.cmake.in
brlcad/branches/bioh/regress/icv/regress-icv_export.cmake.in
brlcad/branches/bioh/regress/icv/regress-icv_import.cmake.in
brlcad/branches/bioh/regress/rtwizard/regress-rtwiz.cmake.in
Modified: brlcad/branches/bioh/regress/gcv/fastgen/regress-fastgen.cmake.in
===================================================================
--- brlcad/branches/bioh/regress/gcv/fastgen/regress-fastgen.cmake.in
2020-05-26 21:49:20 UTC (rev 75944)
+++ brlcad/branches/bioh/regress/gcv/fastgen/regress-fastgen.cmake.in
2020-05-27 01:14:01 UTC (rev 75945)
@@ -14,11 +14,15 @@
message(FATAL_ERROR "Unable to find fast4-g, aborting.\nSee ${LOGFILE} for
more details.")
endif (NOT EXISTS "${FAST4G}")
+# Apparently CMAKE_EXECUTABLE_SUFFIX is not reliably defined in cmake -P - get
+# it from the executable passed in to us.
+get_filename_component(EXE_SUFFIX "${FAST4G}" EXT)
+
# Use the path passed in from the build target generator expression
# to ascertain the current binary directory in use, and locate any
# other necessary programs.
get_filename_component(BDIR "${FAST4G}" DIRECTORY)
-set(GDIFF "${BDIR}/gdiff${CMAKE_EXECUTABLE_SUFFIX}")
+set(GDIFF "${BDIR}/gdiff${EXE_SUFFIX}")
if (NOT EXISTS "${GDIFF}")
file(WRITE "${LOGFILE}" "gdiff not found at location \"${GDIFF}\" -
aborting\n")
message(FATAL_ERROR "Unable to find gdiff, aborting.\nSee ${LOGFILE} for
more details.")
Modified: brlcad/branches/bioh/regress/icv/regress-icv_export.cmake.in
===================================================================
--- brlcad/branches/bioh/regress/icv/regress-icv_export.cmake.in
2020-05-26 21:49:20 UTC (rev 75944)
+++ brlcad/branches/bioh/regress/icv/regress-icv_export.cmake.in
2020-05-27 01:14:01 UTC (rev 75945)
@@ -17,11 +17,15 @@
message(FATAL_ERROR "Unable to find icv, aborting.\nSee ${LOGFILE} for more
details.")
endif (NOT EXISTS "${ICV_EXEC}")
+# Apparently CMAKE_EXECUTABLE_SUFFIX is not reliably defined in cmake -P - get
+# it from the executable passed in to us.
+get_filename_component(EXE_SUFFIX "${ICV_EXEC}" EXT)
+
# Use the path passed in from the build target generator expression
# to ascertain the current binary directory in use, and locate any
# other necessary programs.
get_filename_component(BDIR "${ICV_EXEC}" DIRECTORY)
-set(PIXCMP_EXEC "${BDIR}/pixcmp${CMAKE_EXECUTABLE_SUFFIX}")
+set(PIXCMP_EXEC "${BDIR}/pixcmp${EXE_SUFFIX}")
if (NOT EXISTS "${PIXCMP_EXEC}")
file(WRITE "${LOGFILE}" "pixcmp not found at location \"${PIXCMP_EXEC}\" -
aborting\n")
message(FATAL_ERROR "Unable to find pixcmp, aborting.\nSee ${LOGFILE} for
more details.")
Modified: brlcad/branches/bioh/regress/icv/regress-icv_import.cmake.in
===================================================================
--- brlcad/branches/bioh/regress/icv/regress-icv_import.cmake.in
2020-05-26 21:49:20 UTC (rev 75944)
+++ brlcad/branches/bioh/regress/icv/regress-icv_import.cmake.in
2020-05-27 01:14:01 UTC (rev 75945)
@@ -16,11 +16,15 @@
message(FATAL_ERROR "Unable to find icv, aborting.\nSee ${LOGFILE} for more
details.")
endif (NOT EXISTS "${ICV_EXEC}")
+# Apparently CMAKE_EXECUTABLE_SUFFIX is not reliably defined in cmake -P - get
+# it from the executable passed in to us.
+get_filename_component(EXE_SUFFIX "${ICV_EXEC}" EXT)
+
# Use the path passed in from the build target generator expression
# to ascertain the current binary directory in use, and locate any
# other necessary programs.
get_filename_component(BDIR "${ICV_EXEC}" DIRECTORY)
-set(PIXCMP_EXEC "${BDIR}/pixcmp${CMAKE_EXECUTABLE_SUFFIX}")
+set(PIXCMP_EXEC "${BDIR}/pixcmp${EXE_SUFFIX}")
if (NOT EXISTS "${PIXCMP_EXEC}")
file(WRITE "${LOGFILE}" "pixcmp not found at location \"${PIXCMP_EXEC}\" -
aborting\n")
message(FATAL_ERROR "Unable to find pixcmp, aborting.\nSee ${LOGFILE} for
more details.")
Modified: brlcad/branches/bioh/regress/rtwizard/regress-rtwiz.cmake.in
===================================================================
--- brlcad/branches/bioh/regress/rtwizard/regress-rtwiz.cmake.in
2020-05-26 21:49:20 UTC (rev 75944)
+++ brlcad/branches/bioh/regress/rtwizard/regress-rtwiz.cmake.in
2020-05-27 01:14:01 UTC (rev 75945)
@@ -16,11 +16,15 @@
message(FATAL_ERROR "Unable to find rtwizard, aborting.\nSee ${LOGFILE} for
more details.")
endif (NOT EXISTS "${RTWIZ}")
+# Apparently CMAKE_EXECUTABLE_SUFFIX is not reliably defined in cmake -P - get
+# it from the executable passed in to us.
+get_filename_component(EXE_SUFFIX "${RTWIZ}" EXT)
+
# Use the path passed in from the build target generator expression
# to ascertain the current binary directory in use, and locate any
# other necessary programs.
get_filename_component(BDIR "${RTWIZ}" DIRECTORY)
-set(PIXCMP_EXEC "${BDIR}/pixcmp${CMAKE_EXECUTABLE_SUFFIX}")
+set(PIXCMP_EXEC "${BDIR}/pixcmp${EXE_SUFFIX}")
if (NOT EXISTS "${PIXCMP_EXEC}")
file(WRITE "${LOGFILE}" "pixcmp not found at location \"${PIXCMP_EXEC}\" -
aborting\n")
message(FATAL_ERROR "Unable to find pixcmp, aborting.\nSee ${LOGFILE} for
more details.")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
