guilhem_lavaux/cosmotool
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finished packaging omptl

Browse Source
This commit is contained in:
Guilhem Lavaux 2014-05-22 09:27:53 +02:00
parent 950cfb3eb1
commit b89dbe0987
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -50,12 +50,14 @@ if (ENABLE_SHARP)
SET(SHARP_INCLUDE_PATH ${DEP_BUILD}/include) SET(SHARP_INCLUDE_PATH ${DEP_BUILD}/include)
endif (ENABLE_SHARP) endif (ENABLE_SHARP)
SET(OMPTL_BUILD_DIR ${CMAKE_BINARY_DIR}/omptl-prefix/src/omptl)
ExternalProject_Add(omptl ExternalProject_Add(omptl
URL ${CMAKE_SOURCE_DIR}/external/omptl-20120422.tar.bz2 URL ${CMAKE_SOURCE_DIR}/external/omptl-20120422.tar.bz2
CONFIGURE_COMMAND echo "No configure" CONFIGURE_COMMAND echo "No configure"
BUILD_COMMAND echo "No build" BUILD_COMMAND echo "No build"
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_BINARY_DIR}/omptl-prefix/src/omptl ${CMAKE_BINARY_DIR}/external/stage/include/omptl INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${OMPTL_BUILD_DIR} ${CMAKE_BINARY_DIR}/external/stage/include/omptl
) )
include_directories(${OMPTL_BUILD_DIR}/..)
set(HDF5_FIND_COMPONENTS HL CXX) set(HDF5_FIND_COMPONENTS HL CXX)
if(HDF5_ROOTDIR) if(HDF5_ROOTDIR)

2
src/CMakeLists.txt
View File

@ -89,5 +89,7 @@ endif (BUILD_SHARED_LIBS)
install(DIRECTORY . DESTINATION include/CosmoTool install(DIRECTORY . DESTINATION include/CosmoTool
FILES_MATCHING PATTERN "*.hpp") FILES_MATCHING PATTERN "*.hpp")
install(DIRECTORY ${OMPTL_BUILD_DIR}
DESTINATION include/CosmoTool/omptl)
install(DIRECTORY . DESTINATION include/CosmoTool install(DIRECTORY . DESTINATION include/CosmoTool
FILES_MATCHING PATTERN "*.tcc") FILES_MATCHING PATTERN "*.tcc")

1
src/mykdtree.tcc
View File

@ -1,5 +1,6 @@
#include "replicateGenerator.hpp" #include "replicateGenerator.hpp"
#include <cstring> #include <cstring>
#include "omptl/omptl_algorithm"
#include <algorithm> #include <algorithm>
#include <limits> #include <limits>
#include <iostream> #include <iostream>