From f33290fe26f647bfa71e6ac922809223840ff36f Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Thu, 23 Jun 2016 23:18:24 +0300 Subject: [PATCH] In progress... --- CMakeLists.txt | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 21e91b5..0295e6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,22 +13,6 @@ SET (MAJOR 0) SET (MINOR 0) SET (PATCH 0) -ExternalProject_Add (desktop - SOURCE_DIR ${CMAKE_SOURCE_DIR}/desktop - #CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=bundle - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/bundle -# PREFIX desktop - INSTALL_DIR bundle -) - -ExternalProject_Add (core - SOURCE_DIR ${CMAKE_SOURCE_DIR}/core - #CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=bundle - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/bundle -# PREFIX core - INSTALL_DIR bundle -) - ExternalProject_Add (gobject-plugin SOURCE_DIR ${CMAKE_SOURCE_DIR}/gobject-plugin #CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=bundle @@ -45,6 +29,14 @@ ExternalProject_Add (latex-struct INSTALL_DIR bundle ) +ExternalProject_Add (core + SOURCE_DIR ${CMAKE_SOURCE_DIR}/core + #CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=bundle + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/bundle +# PREFIX core + INSTALL_DIR bundle +) + ExternalProject_Add (data-example SOURCE_DIR ${CMAKE_SOURCE_DIR}/data-example #CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=bundle @@ -61,6 +53,14 @@ ExternalProject_Add (object-example INSTALL_DIR bundle ) +ExternalProject_Add (desktop + SOURCE_DIR ${CMAKE_SOURCE_DIR}/desktop + #CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=bundle + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/bundle +# PREFIX desktop + INSTALL_DIR bundle +) +