Revision: 45964
http://brlcad.svn.sourceforge.net/brlcad/?rev=45964&view=rev
Author: starseeker
Date: 2011-08-13 04:24:33 +0000 (Sat, 13 Aug 2011)
Log Message:
-----------
Go with the most expected/convenient behavior - can't think of a valid case to
install a rel into a dev dir or vice versa, complete and deceptive violation of
convention and more convenient/useful to have the install dir swapped as a
function of build type.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2011-08-13 04:19:45 UTC (rev 45963)
+++ brlcad/trunk/CMakeLists.txt 2011-08-13 04:24:33 UTC (rev 45964)
@@ -405,14 +405,13 @@
ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR NOT CMAKE_INSTALL_PREFIX)
SET(BRLCAD_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE STRING "BRL-CAD install
prefix")
-# One thing we will warn about is a Release build with the Debug install path
-# or a Debug build with the Release install path - generally speaking a BAD
-# idea.
+# If we've got a Release build with a Debug path or vice versa, change it -
that
+# is probably the most "expected" behavior.
IF("${CMAKE_BUILD_TYPE}" MATCHES "Release" AND ${CMAKE_INSTALL_PREFIX}
STREQUAL "/usr/brlcad/dev-${BRLCAD_VERSION}")
- MESSAGE(WARNING "Build Type is Release but CMAKE_INSTALL_PREFIX is set
to the Debug install path! To correct this, clear CMAKE_INSTALL_PREFIX and
re-configure.")
+ SET(CMAKE_INSTALL_PREFIX "/usr/brlcad/rel-${BRLCAD_VERSION}" CACHE
STRING "BRL-CAD install prefix" FORCE)
ENDIF("${CMAKE_BUILD_TYPE}" MATCHES "Release" AND ${CMAKE_INSTALL_PREFIX}
STREQUAL "/usr/brlcad/dev-${BRLCAD_VERSION}")
IF("${CMAKE_BUILD_TYPE}" MATCHES "Debug" AND ${CMAKE_INSTALL_PREFIX} STREQUAL
"/usr/brlcad/rel-${BRLCAD_VERSION}")
- MESSAGE(WARNING "Build Type is Debug but CMAKE_INSTALL_PREFIX is set to
the Release install path! To correct this, clear CMAKE_INSTALL_PREFIX and
re-configure.")
+ SET(CMAKE_INSTALL_PREFIX "/usr/brlcad/dev-${BRLCAD_VERSION}" CACHE
STRING "BRL-CAD install prefix" FORCE)
ENDIF("${CMAKE_BUILD_TYPE}" MATCHES "Debug" AND ${CMAKE_INSTALL_PREFIX}
STREQUAL "/usr/brlcad/rel-${BRLCAD_VERSION}")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
FREE DOWNLOAD - uberSVN with Social Coding for Subversion.
Subversion made easy with a complete admin console. Easy
to use, easy to manage, easy to install, easy to extend.
Get a Free download of the new open ALM Subversion platform now.
http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
