From 9f1d57b499f8544523841d2adea4fda404a923ef Mon Sep 17 00:00:00 2001 From: "Joshua L. Blocher" Date: Sun, 25 May 2008 18:12:47 +0000 Subject: Cmake: More Dependency work, added new files (bzr r5754) --- CMakeScripts/ConfigPaths.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'CMakeScripts/ConfigPaths.cmake') diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake index 7e73a761b..651df5bbf 100644 --- a/CMakeScripts/ConfigPaths.cmake +++ b/CMakeScripts/ConfigPaths.cmake @@ -8,12 +8,12 @@ ELSEIF(WIN32) ENDIF(WIN32) SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) -SET(CMAKE_SKIP_RPATH:BOOL OFF) +SET(CMAKE_SKIP_RPATH:BOOL OFF) # Include base dir, so other files can refer to the generated files. # CMAKE_INCLUDE_CURRENT_DIR is not enough as it only includes the current dir and not the basedir with config.h in it #INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}" "${PROJECT_SOURCE_DIR}" src/) -LINK_DIRECTORIES ("${LINK_DIRECTORIES}" "${CMAKE_BINARY_DIR}" "${PROJECT_SOURCE_DIR}" src/) +#LINK_DIRECTORIES ("${LINK_DIRECTORIES}" "${CMAKE_BINARY_DIR}" "${PROJECT_SOURCE_DIR}" src/) #INSTALL(TARGETS INKSCAPE # RUNTIME DESTINATION bin @@ -26,4 +26,6 @@ LINK_DIRECTORIES ("${LINK_DIRECTORIES}" "${CMAKE_BINARY_DIR}" "${PROJECT_SOURCE_ #CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/INKSCAPE.pc.in # ${CMAKE_BINARY_DIR}/INKSCAPE.pc @ONLY IMMEDIATE ) -#INSTALL(FILES "${CMAKE_BINARY_DIR}/INKSCAPE.pc" DESTINATION lib/pkgconfig) +#INSTALL(FILES "${CMAKE_BINARY_DIR}/INKSCAPE.pc" DESTINATION lib/pkgconfig) + +#SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "Where to put the executables")set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "Where to put the libraries") -- cgit v1.2.3