Final change to build system

Author: cschreib

CMakeLists.txt

@@ -2,12 +2,28 @@ cmake_minimum_required(VERSION 2.6)
 project(FAST++-superbuild C CXX)
 
 if (NOT CMAKE_BUILD_TYPE)
-    message(STATUS "No build type selected, default to Release (-DCMAKE_BUILD_TYPE=...)")
+    message(STATUS "No build type selected (-DCMAKE_BUILD_TYPE=...)")
+    message(STATUS "Default to Release.")
     set(CMAKE_BUILD_TYPE "Release")
 endif()
 
 include(ExternalProject)
 
+# Set default install dir to "here"
+if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    message(STATUS "No install directory selected (-DCMAKE_INSTALL_PREFIX=...)")
+    message(STATUS "Default to ${PROJECT_SOURCE_DIR}/bin")
+    set(CMAKE_INSTALL_PREFIX "${PROJECT_SOURCE_DIR}" CACHE PATH "default install path" FORCE)
+endif()
+
+if (CMAKE_INSTALL_PREFIX STREQUAL ${PROJECT_SOURCE_DIR})
+    set(FASTPP_SHARE_DIR ${PROJECT_SOURCE_DIR}/share)
+    set(INSTALL_SHARED_DATA "0")
+else()
+    set(FASTPP_SHARE_DIR ${CMAKE_INSTALL_PREFIX}/share/FAST++)
+    set(INSTALL_SHARED_DATA "1")
+endif()
+
 # Configure and build cfitsio
 ExternalProject_Add(cfitsio
     SOURCE_DIR ${PROJECT_SOURCE_DIR}/external/cfitsio
@@ -42,15 +58,21 @@ ExternalProject_Add(phy++
 ExternalProject_Add(fast++
     DEPENDS phy++
     SOURCE_DIR ${PROJECT_SOURCE_DIR}/src
-    DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/external/phypp
     CMAKE_ARGS
-        -DNO_REFLECTION=ON
-        -DNO_FFTW=ON
-        -DNO_LAPACK=ON
-        -DNO_GSL=ON
-        -DNO_WCSLIB=ON
-        -DPHYPP_INPLACE_BUILD=ON
         -DCFITSIO_ROOT_DIR=${PROJECT_SOURCE_DIR}/external
-        -DCMAKE_INSTALL_PREFIX=${PROJECT_SOURCE_DIR}/external
-        -DCMAKE_BUILD_TYPE=Release)
+        -DPHYPP_ROOT_DIR=${PROJECT_SOURCE_DIR}/external
+        -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
+        -DCMAKE_MODULE_PATH=${PROJECT_SOURCE_DIR}/external/phypp/cmake
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -DFASTPP_SHARE_DIR=${FASTPP_SHARE_DIR})
+
+if (INSTALL_SHARED_DATA)
+    install(FILES
+        share/FILTER.RES.latest
+        share/TEMPLATE_ERROR.fast.v0.2
+        DESTINATION ${FASTPP_SHARE_DIR} COMPONENT data)
+endif()
 
+install(PROGRAMS
+    ${CMAKE_BINARY_DIR}/bin/fast++
+    DESTINATION bin COMPONENT runtime)

src/share/FILTER.RES.latest renamed to share/FILTER.RES.latest

@@ -6,28 +6,20 @@ if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
 endif()
 
-set(CFITSIO_ROOT_DIR ${PROJECT_SOURCE_DIR}/../external)
-set(PHYPP_ROOT_DIR ${PROJECT_SOURCE_DIR}/../external)
 set(NO_REFLECTION ON)
 set(NO_FFTW ON)
 set(NO_LAPACK ON)
 set(NO_GSL ON)
 set(NO_WCSLIB ON)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/../external/phypp/cmake")
+
 find_package(phypp REQUIRED)
 
 # Setup share directory
-set(FASTPP_SHARE_DIR ${CMAKE_INSTALL_PREFIX}/share/FAST++)
-install(FILES
-    share/FILTER.RES.latest
-    share/TEMPLATE_ERROR.fast.v0.2
-    DESTINATION ${FASTPP_SHARE_DIR} COMPONENT data)
-
 add_definitions(-DFASTPP_SHARE_DIR="${FASTPP_SHARE_DIR}")
 
 # Include dependencies
+message(STATUS ${PHYPP_INCLUDE_DIRS})
 include_directories(${PHYPP_INCLUDE_DIRS})
-include_directories(${PROJECT_SOURCE_DIR}/../external/include)
 
 # Build FAST++
 add_executable(fast++