Revision: 77619
http://sourceforge.net/p/brlcad/code/77619
Author: starseeker
Date: 2020-10-23 21:13:28 +0000 (Fri, 23 Oct 2020)
Log Message:
-----------
Having to re-think how this install path rewriting is working for multiconfig
setups. Checkpointing a working setup that probably only works for multiconfig
- more work to do, but need to snapshot a successful state.
Modified Paths:
--------------
brlcad/branches/extbuild/misc/CMake/BRLCAD_Install_Prefix.cmake
brlcad/branches/extbuild/misc/CMake/multiconfig_path_read.cmake.in
Modified: brlcad/branches/extbuild/misc/CMake/BRLCAD_Install_Prefix.cmake
===================================================================
--- brlcad/branches/extbuild/misc/CMake/BRLCAD_Install_Prefix.cmake
2020-10-23 18:14:32 UTC (rev 77618)
+++ brlcad/branches/extbuild/misc/CMake/BRLCAD_Install_Prefix.cmake
2020-10-23 21:13:28 UTC (rev 77619)
@@ -97,25 +97,25 @@
# https://cmake.org/cmake/help/latest/command/install.html
#
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR NOT CMAKE_INSTALL_PREFIX)
- if(NOT CMAKE_CONFIGURATION_TYPES)
- if("${CMAKE_BUILD_TYPE}" MATCHES "Release")
- set(CMAKE_INSTALL_PREFIX "/usr/brlcad/rel-${BRLCAD_VERSION}")
- else("${CMAKE_BUILD_TYPE}" MATCHES "Release")
- set(CMAKE_INSTALL_PREFIX "/usr/brlcad/dev-${BRLCAD_VERSION}")
- endif("${CMAKE_BUILD_TYPE}" MATCHES "Release")
- else(NOT CMAKE_CONFIGURATION_TYPES)
- if(MSVC)
- if(CMAKE_CL_64)
- set(CMAKE_INSTALL_PREFIX "C:/Program Files/BRL-CAD ${BRLCAD_VERSION}")
- else(CMAKE_CL_64)
- set(CMAKE_INSTALL_PREFIX "C:/Program Files (x86)/BRL-CAD
${BRLCAD_VERSION}")
- endif(CMAKE_CL_64)
- else(MSVC)
- set(CMAKE_INSTALL_PREFIX "/usr/brlcad/dev-${BRLCAD_VERSION}")
- endif(MSVC)
- endif(NOT CMAKE_CONFIGURATION_TYPES)
- set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "BRL-CAD install
prefix" FORCE)
- set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT 0)
+ if(NOT CMAKE_CONFIGURATION_TYPES)
+ if("${CMAKE_BUILD_TYPE}" MATCHES "Release")
+ set(CMAKE_INSTALL_PREFIX
"/usr/brlcad/rel-${BRLCAD_VERSION}")
+ else("${CMAKE_BUILD_TYPE}" MATCHES "Release")
+ set(CMAKE_INSTALL_PREFIX
"/usr/brlcad/dev-${BRLCAD_VERSION}")
+ endif("${CMAKE_BUILD_TYPE}" MATCHES "Release")
+ else(NOT CMAKE_CONFIGURATION_TYPES)
+ if(MSVC)
+ if(CMAKE_CL_64)
+ set(CMAKE_INSTALL_PREFIX "C:/Program
Files/BRL-CAD ${BRLCAD_VERSION}")
+ else(CMAKE_CL_64)
+ set(CMAKE_INSTALL_PREFIX "C:/Program Files
(x86)/BRL-CAD ${BRLCAD_VERSION}")
+ endif(CMAKE_CL_64)
+ else(MSVC)
+ set(CMAKE_INSTALL_PREFIX
"/usr/brlcad/----BUILD_TYPE-----${BRLCAD_VERSION}")
+ endif(MSVC)
+ endif(NOT CMAKE_CONFIGURATION_TYPES)
+ set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "BRL-CAD
install prefix" FORCE)
+ set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT 0)
endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR NOT CMAKE_INSTALL_PREFIX)
set(BRLCAD_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE STRING "BRL-CAD install
prefix")
mark_as_advanced(BRLCAD_PREFIX)
Modified: brlcad/branches/extbuild/misc/CMake/multiconfig_path_read.cmake.in
===================================================================
--- brlcad/branches/extbuild/misc/CMake/multiconfig_path_read.cmake.in
2020-10-23 18:14:32 UTC (rev 77618)
+++ brlcad/branches/extbuild/misc/CMake/multiconfig_path_read.cmake.in
2020-10-23 21:13:28 UTC (rev 77619)
@@ -73,15 +73,44 @@
if(NOT "${BUILD_TYPE_NEW}" STREQUAL "${BUILD_TYPE}")
file(GLOB_RECURSE ALL_CMAKE_INSTALL_FILES "cmake_install.cmake")
foreach(cmake_install_file ${ALL_CMAKE_INSTALL_FILES})
+ message("cmake_install_file: ${cmake_install_file}")
if(EXISTS "${cmake_install_file}.orig")
- file(READ "${cmake_install_file}.orig" OLD_INSTALL_CONTENTS)
+ file(STRINGS "${cmake_install_file}.orig" OLD_INSTALL_CONTENTS)
else(EXISTS "${cmake_install_file}.orig")
- file(READ "${cmake_install_file}" OLD_INSTALL_CONTENTS)
- file(WRITE "${cmake_install_file}.orig" "\n${OLD_INSTALL_CONTENTS}")
+ file(READ "${cmake_install_file}" ORIG_INSTALL_CONTENTS)
+ file(WRITE "${cmake_install_file}.orig" "\n${ORIG_INSTALL_CONTENTS}")
+ file(STRINGS "${cmake_install_file}.orig" OLD_INSTALL_CONTENTS)
endif(EXISTS "${cmake_install_file}.orig")
- string(REPLACE "${CMAKE_INSTALL_PREFIX_CFG_ORIG}"
"${CMAKE_INSTALL_PREFIX_CFG}" INSTALL_CONTENTS "${OLD_INSTALL_CONTENTS}")
- string(REPLACE "@CMAKE_BINARY_DIR@/@CMAKE_CFG_INTDIR@"
"@CMAKE_BINARY_DIR@/${BUILD_TYPE}" INSTALL_CONTENTS "${INSTALL_CONTENTS}")
- file(WRITE "${cmake_install_file}" "${INSTALL_CONTENTS}")
+ file(REMOVE "${cmake_install_file}")
+ foreach(line ${OLD_INSTALL_CONTENTS})
+ set(nline "${line}")
+ if (NOT "${nline}" MATCHES ".cmake_install.*"
+ )
+ if ("${nline}" MATCHES ".*${CMAKE_INSTALL_PREFIX_CFG_ORIG}.*")
+ message("nline1_pre: ${nline}")
+ string(REPLACE "${CMAKE_INSTALL_PREFIX_CFG_ORIG}"
"${CMAKE_INSTALL_PREFIX_CFG}" nline "${nline}")
+ message("nline1_post: ${nline}")
+ endif ("${nline}" MATCHES ".*${CMAKE_INSTALL_PREFIX_CFG_ORIG}.*")
+ if ("${nline}" MATCHES ".*CONFIG.*")
+ message("nline2_pre: ${nline}")
+ string(REPLACE "$<CONFIG>/" "${BUILD_TYPE}/" nline "${nline}")
+ string(REPLACE "$<CONFIG>" "${BUILD_TYPE}" nline "${nline}")
+ message("nline2_post: ${nline}")
+ endif ("${nline}" MATCHES ".*CONFIG.*")
+ if ("${nline}" MATCHES ".*CONFIGURATION.*")
+ message("nline3_pre: ${nline}")
+ string(REPLACE "\${CONFIGURATION}/" "${BUILD_TYPE}/" nline "${nline}")
+ string(REPLACE "\${CONFIGURATION}" "${BUILD_TYPE}" nline "${nline}")
+ message("nline3_post: ${nline}")
+ endif ("${nline}" MATCHES ".*CONFIGURATION.*")
+ if ("${nline}" MATCHES ".*----BUILD_TYPE----.*")
+ message("nline4_pre: ${nline}")
+ string(REPLACE "----BUILD_TYPE----" "${BUILD_TYPE_NEW}" nline
"${nline}")
+ message("nline4_post: ${nline}")
+ endif ("${nline}" MATCHES ".*----BUILD_TYPE----.*")
+ endif ()
+ file(APPEND "${cmake_install_file}" "${nline}\n")
+ endforeach(line ${OLD_INSTALL_CONTENTS})
endforeach(cmake_install_file ${ALL_CMAKE_INSTALL_FILES})
endif(NOT "${BUILD_TYPE_NEW}" STREQUAL "${BUILD_TYPE}")
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
