Commit 6e1a3511 authored by Julien Wintz's avatar Julien Wintz
Browse files

Updating build tree to get more information in various configuration files

parent a57c4ffa
......@@ -70,9 +70,11 @@ else(NOT APPLE AND NOT MSVC)
endif(NOT APPLE AND NOT MSVC)
if(CMAKE_SIZEOF_VOID_P MATCHES 8)
set(DTK_PLATFORM_64 1)
set(DTK_BUILD_32 0)
set(DTK_BUILD_64 1)
else(CMAKE_SIZEOF_VOID_P MATCHES 8)
set(DTK_PLATFORM_32 1)
set(DTK_BUILD_32 1)
set(DTK_BUILD_64 0)
endif(CMAKE_SIZEOF_VOID_P MATCHES 8)
## ###################################################################
......@@ -105,6 +107,8 @@ find_package(Qt5Xml REQUIRED)
## Dependencies - Optional [TO BE REMOVED]
## #################################################################
set(DTK_HAVE_MPI "NO")
if(DTK_BUILD_SUPPORT_DISTRIBUTED)
find_package(MPI QUIET)
......
## Version: $Id$
##
##
######################################################################
##
### Commentary:
##
##
### Commentary:
##
######################################################################
##
##
### Change Log:
##
##
######################################################################
##
##
### Code:
set(DTK_BUILD_32 @DTK_BUILD_32@)
set(DTK_BUILD_64 @DTK_BUILD_64@)
## ###################################################################
## Defines:
## - dtk_INCLUDE_DIRS
......@@ -25,8 +28,7 @@ set(dtk_INCLUDE_DIRS
"@CMAKE_CURRENT_SOURCE_DIR@/src/dtkDistributed"
"@CMAKE_CURRENT_SOURCE_DIR@/src/dtkMath"
"@CMAKE_CURRENT_SOURCE_DIR@/src/dtkTest"
"@CMAKE_CURRENT_BINARY_DIR@"
)
"@CMAKE_CURRENT_BINARY_DIR@")
include("@CMAKE_BINARY_DIR@/dtkDepends.cmake")
......@@ -34,9 +36,6 @@ include("@CMAKE_BINARY_DIR@/dtkDepends.cmake")
## Options
## ###################################################################
# needed for Support
set(DTK_HAVE_MPI @DTK_HAVE_MPI@)
set(DTK_BUILD_SUPPORT_CORE @DTK_BUILD_SUPPORT_CORE@)
set(DTK_BUILD_SUPPORT_CONTAINER @DTK_BUILD_SUPPORT_CONTAINER@)
set(DTK_BUILD_SUPPORT_COMPOSER @DTK_BUILD_SUPPORT_COMPOSER@)
......@@ -45,5 +44,7 @@ set(DTK_BUILD_SUPPORT_GUI @DTK_BUILD_SUPPORT_GUI@)
set(DTK_BUILD_SUPPORT_MATH @DTK_BUILD_SUPPORT_MATH@)
set(DTK_BUILD_SUPPORT_PLOT @DTK_BUILD_SUPPORT_PLOT@)
set(DTK_HAVE_MPI @DTK_HAVE_MPI@)
######################################################################
### dtkConfig.cmake.in ends here
## Version: $Id$
##
##
######################################################################
##
### Commentary:
##
##
### Commentary:
##
######################################################################
##
##
### Change Log:
##
##
######################################################################
##
##
### Code:
set(DTK_BUILD_32 @DTK_BUILD_32@)
set(DTK_BUILD_64 @DTK_BUILD_64@)
## ###################################################################
## Defines:
## - dtk_INCLUDE_DIRS
......@@ -25,8 +28,7 @@ set(dtk_INCLUDE_DIRS
"@CMAKE_INSTALL_PREFIX@/include/dtkLog"
"@CMAKE_INSTALL_PREFIX@/include/dtkMath"
"@CMAKE_INSTALL_PREFIX@/include/dtkMeta"
"@CMAKE_INSTALL_PREFIX@/include/dtkTest"
)
"@CMAKE_INSTALL_PREFIX@/include/dtkTest")
include("@CMAKE_INSTALL_PREFIX@/cmake/dtkDepends.cmake")
......@@ -34,9 +36,6 @@ include("@CMAKE_INSTALL_PREFIX@/cmake/dtkDepends.cmake")
## Options
## ###################################################################
# needed for Support
set(DTK_HAVE_MPI @DTK_HAVE_MPI@)
set(DTK_BUILD_SUPPORT_CORE @DTK_BUILD_SUPPORT_CORE@)
set(DTK_BUILD_SUPPORT_CONTAINER @DTK_BUILD_SUPPORT_CONTAINER@)
set(DTK_BUILD_SUPPORT_COMPOSER @DTK_BUILD_SUPPORT_COMPOSER@)
......@@ -45,5 +44,7 @@ set(DTK_BUILD_SUPPORT_GUI @DTK_BUILD_SUPPORT_GUI@)
set(DTK_BUILD_SUPPORT_MATH @DTK_BUILD_SUPPORT_MATH@)
set(DTK_BUILD_SUPPORT_PLOT @DTK_BUILD_SUPPORT_PLOT@)
set(DTK_HAVE_MPI @DTK_HAVE_MPI@)
######################################################################
### dtkConfig.cmake.in ends here
......@@ -23,5 +23,8 @@
#cmakedefine DTK_BUILD_SUPPORT_PLOT
#cmakedefine DTK_BUILD_SUPPORT_COMPOSER
#cmakedefine DTK_BUILD_32
#cmakedefine DTK_BUILD_64
//
// dtkConfig.h.in ends here
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment