Revision: 40984
http://brlcad.svn.sourceforge.net/brlcad/?rev=40984&view=rev
Author: starseeker
Date: 2010-10-13 21:55:17 +0000 (Wed, 13 Oct 2010)
Log Message:
-----------
Looks like some of the variables we were using were considered obsolete - try
updating things a bit and see if that helps on Windows any...
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/misc/CMake/ThirdParty.cmake
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-10-13 21:19:45 UTC (rev
40983)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-10-13 21:55:17 UTC (rev
40984)
@@ -270,12 +270,15 @@
#---------------------------------------------------------------------
# Output directories - this is where built library and executable
# files will be placed after building but prior to install.
-IF(NOT LIBRARY_OUTPUT_PATH)
- SET(LIBRARY_OUTPUT_PATH ${BRLCAD_BINARY_DIR}/lib CACHE INTERNAL "Single
output directory for building all libraries.")
-ENDIF(NOT LIBRARY_OUTPUT_PATH)
-IF(NOT EXECUTABLE_OUTPUT_PATH)
- SET(EXECUTABLE_OUTPUT_PATH ${BRLCAD_BINARY_DIR}/bin CACHE INTERNAL
"Single output directory for building all executables.")
-ENDIF(NOT EXECUTABLE_OUTPUT_PATH)
+IF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${BRLCAD_BINARY_DIR}/lib CACHE
INTERNAL "Single output directory for building all libraries.")
+ENDIF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+IF(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
+ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${BRLCAD_BINARY_DIR}/lib CACHE
INTERNAL "Single output directory for building all archives.")
+ENDIF(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
+IF(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${BRLCAD_BINARY_DIR}/bin CACHE
INTERNAL "Single output directory for building all executables.")
+ENDIF(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
#---------------------------------------------------------------------
# Configure install locations. It may be that this should be made
Modified: brlcad/branches/cmake/misc/CMake/ThirdParty.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/ThirdParty.cmake 2010-10-13 21:19:45 UTC
(rev 40983)
+++ brlcad/branches/cmake/misc/CMake/ThirdParty.cmake 2010-10-13 21:55:17 UTC
(rev 40984)
@@ -28,7 +28,7 @@
# that it may introduce extra build work just from trying
configure options, but appears
# to be essential to ensuring that the build "just works" each
time.
STRING(REGEX REPLACE "lib" "" rootname "${lower}")
- FILE(GLOB STALE_FILES
"${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${rootname}*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
+ FILE(GLOB STALE_FILES
"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${rootname}*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
MESSAGE("STALE_FILES: ${STALE_FILES}")
FOREACH(stale_file ${STALE_FILES})
EXEC_PROGRAM(
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
