diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-06-17 03:48:27 +0000 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-06-17 03:48:27 +0000 |
| commit | 9a92284acd9da0c6294b6c0925149b1b3b00d589 (patch) | |
| tree | 793871b85bc0d502efe2357baddac459f840c902 | |
| parent | Conditionalize compilation of image magick sources in cmake. (diff) | |
| download | inkscape-9a92284acd9da0c6294b6c0925149b1b3b00d589.tar.gz inkscape-9a92284acd9da0c6294b6c0925149b1b3b00d589.zip | |
minor changes to cmake, use lib/ and bin/ in the build dir.
(bzr r10311)
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 9 |
2 files changed, 12 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 148d46691..54bb62775 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,11 +5,13 @@ # # ideasman42 +cmake_minimum_required(VERSION 2.8.0) +list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeScripts") + project(inkscape) set(INKSCAPE_VERSION 0.48+devel) set(PROJECT_NAME inkscape) -cmake_minimum_required(VERSION 2.8.0) set(CMAKE_INCLUDE_CURRENT_DIR TRUE) if(COMMAND cmake_policy) @@ -24,7 +26,11 @@ if(CMAKE_COMPILER_IS_GNUCC) endif() endif() -list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeScripts") +#----------------------------------------------------------------------------- +# Redirect output files + +set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE ) +set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE ) # ----------------------------------------------------------------------------- # Options @@ -95,7 +101,7 @@ if(UNIX) ) install( - PROGRAMS ${CMAKE_BINARY_DIR}/src/inkscape + PROGRAMS ${EXECUTABLE_OUTPUT_PATH}/inkscape DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index c64cb6fdf..591de1327 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -112,7 +112,7 @@ list(APPEND INKSCAPE_INCS ${LIBXML2_INCLUDE_DIR}) list(APPEND INKSCAPE_LIBS ${LIBXML2_LIBRARIES}) add_definitions(${LIBXML2_DEFINITIONS}) -find_package(OpenMP REQUIRED) # cmake's +find_package(OpenMP) if(OpenMP_FOUND) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") @@ -121,7 +121,7 @@ if(OpenMP_FOUND) endif() mark_as_advanced(OpenMP_C_FLAGS) mark_as_advanced(OpenMP_CXX_FLAGS) -endif(OpenMP_FOUND) +endif() find_package(ZLIB REQUIRED) list(APPEND INKSCAPE_INCS ${ZLIB_INCLUDE_DIRS}) @@ -131,14 +131,11 @@ find_package(ImageMagick COMPONENTS MagickCore Magick++) if(ImageMagick_FOUND) list(APPEND INKSCAPE_INCS ${ImageMagick_MagickCore_INCLUDE_DIR}) list(APPEND INKSCAPE_LIBS ${ImageMagick_Magick++_LIBRARY}) -endif(ImageMagick_FOUND) +endif() include(IncludeJava) # end Dependencies -# message(FATAL_ERROR "Whee: ${INKSCAPE_INCS}") -# message(FATAL_ERROR "Whee: ${INKSCAPE_LIBS}") -# message(FATAL_ERROR "Whee: ${INKSCAPE_LINK_DIRS}") # C/C++ Flags include_directories(SYSTEM ${INKSCAPE_INCS}) |