Revision: 77491
http://sourceforge.net/p/brlcad/code/77491
Author: starseeker
Date: 2020-10-19 04:04:54 +0000 (Mon, 19 Oct 2020)
Log Message:
-----------
Fix input string, and it's OK if we don't have Tk for itcl.
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
brlcad/branches/thirdparty_rework/src/superbuild/itcl3/CMakeLists.txt
Modified:
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
===================================================================
---
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
2020-10-19 03:48:31 UTC (rev 77490)
+++
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
2020-10-19 04:04:54 UTC (rev 77491)
@@ -332,8 +332,9 @@
fcfgcpy(TOUT ${extproj} ${extroot} ${fname} ${SHARED_DIR} ${fname})
+ # On Windows, we need both a .dll and a .lib file to use a shared library
for compilation
if (MSVC)
- string(REPLACE "${CMAKE_SHARED_LIBRARY_SUFFIX}" ".lib" IMPLIB_FILE
"${IMPLIB_FILE}")
+ string(REPLACE "${CMAKE_SHARED_LIBRARY_SUFFIX}" ".lib" IMPLIB_FILE
"${fname}")
fcfgcpy(TOUT ${extproj} ${extroot} ${IMPLIB_FILE} ${LIB_DIR}
${IMPLIB_FILE})
endif (MSVC)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itcl3/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itcl3/CMakeLists.txt
2020-10-19 03:48:31 UTC (rev 77490)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itcl3/CMakeLists.txt
2020-10-19 04:04:54 UTC (rev 77491)
@@ -44,7 +44,7 @@
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
-find_package(TCL REQUIRED)
+find_package(TCL)
# version numbers
set(ITCL_VERSION_MAJOR 3)
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
