[brlcad-commits] SF.net SVN: brlcad:[40514] brlcad/branches/cmake/src/other/step/misc/CMake/ SCL_Utils.cmake

[<sta...@us...>]

Revision: 40514
          http://brlcad.svn.sourceforge.net/brlcad/?rev=40514&view=rev
Author:   starseeker
Date:     2010-09-09 14:51:55 +0000 (Thu, 09 Sep 2010)

Log Message:
-----------
Duh. Use the actual install variables and it actually works.

Modified Paths:
--------------
    brlcad/branches/cmake/src/other/step/misc/CMake/SCL_Utils.cmake

Modified: brlcad/branches/cmake/src/other/step/misc/CMake/SCL_Utils.cmake
===================================================================
--- brlcad/branches/cmake/src/other/step/misc/CMake/SCL_Utils.cmake	2010-09-09 14:44:41 UTC (rev 40513)
+++ brlcad/branches/cmake/src/other/step/misc/CMake/SCL_Utils.cmake	2010-09-09 14:51:55 UTC (rev 40514)
@@ -3,7 +3,7 @@
   STRING(REGEX REPLACE " " ";" libslist "${libs}")
   add_executable(${execname} ${srcslist})
   target_link_libraries(${execname} ${libslist})
-  INSTALL(TARGETS ${execname} RUNTIME DESTINATION ${EXECUTABLE_OUTPUT_PATH})
+  INSTALL(TARGETS ${execname} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 ENDMACRO(SCL_ADDEXEC execname srcs libs)
 
 MACRO(SCL_ADDLIB libname srcs libs)
@@ -14,7 +14,7 @@
 	  if(NOT ${libs} MATCHES "NONE")
 		  target_link_libraries(${libname} ${libslist})
 	  endif(NOT ${libs} MATCHES "NONE")
-	  INSTALL(TARGETS ${libname} LIBRARY DESTINATION ${LIBRARY_OUTPUT_PATH})
+	  INSTALL(TARGETS ${libname} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
   ENDIF(BUILD_SHARED_LIBS)
   IF(BUILD_STATIC_LIBS)
 	  add_library(${libname}-static STATIC ${srcslist})
@@ -28,6 +28,6 @@
 		  # http://www.cmake.org/Wiki/CMake_FAQ#How_do_I_make_my_shared_and_static_libraries_have_the_same_root_name.2C_but_different_suffixes.3F
 		  SET_TARGET_PROPERTIES(${libname}-static PROPERTIES PREFIX "lib")
 	  ENDIF(WIN32)
-	  INSTALL(TARGETS ${libname}-static ARCHIVE DESTINATION ${LIBRARY_OUTPUT_PATH})
+	  INSTALL(TARGETS ${libname}-static ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
   ENDIF(BUILD_STATIC_LIBS)
 ENDMACRO(SCL_ADDLIB libname srcs libs)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.