Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Maintenance - Mise à jour mensuelle Lundi 6 Février entre 7h00 et 9h00
Open sidebar
QTL
spell-qtl
Commits
143174a8
Commit
143174a8
authored
Jun 12, 2017
by
Damien Leroux
Browse files
Removed dependency on x2c.
parent
eb3c5581
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
143174a8
...
...
@@ -64,13 +64,13 @@ MESSAGE(STATUS "CXX FLAGS ${CMAKE_CXX_FLAGS}")
find_library
(
EXPAT_LIBRARY_NAMES expat
)
find_path
(
EXPAT_INCLUDE_DIR expat.h HINTS /usr/include /usr/local/include /usr/include/expat/ /usr/local/include/expat/
)
find_path
(
X2C_INCLUDE_DIR x2c/x2c.h HINTS /usr/include/ /usr/local/include/ /home/daleroux/include/
)
#
find_path(X2C_INCLUDE_DIR x2c/x2c.h HINTS /usr/include/ /usr/local/include/ /home/daleroux/include/)
find_path
(
EIGEN_INCLUDE_DIR Eigen/Eigen HINTS /usr/include /usr/local/include /usr/include/eigen3/ /usr/local/include/eigen3/ /home/daleroux/include/eigen3/
)
include_directories
(
AFTER 3rd-party/ThreadPool
)
include_directories
(
AFTER
${
CMAKE_SOURCE_DIR
}
/include/
${
CMAKE_SOURCE_DIR
}
/include/input/
${
CMAKE_SOURCE_DIR
}
/include/bayes/
${
EIGEN_INCLUDE_DIR
}
)
include_directories
(
SYSTEM /usr/include
${
Boost_INCLUDE_DIRS
}
${
EXPAT_INCLUDE_DIR
}
${
X2C_INCLUDE_DIR
}
)
include_directories
(
AFTER /usr/include
${
Boost_INCLUDE_DIRS
}
${
EXPAT_INCLUDE_DIR
}
${
X2C_INCLUDE_DIR
}
)
include_directories
(
SYSTEM /usr/include
${
Boost_INCLUDE_DIRS
}
${
EXPAT_INCLUDE_DIR
}
)
include_directories
(
AFTER /usr/include
${
Boost_INCLUDE_DIRS
}
${
EXPAT_INCLUDE_DIR
}
)
if
(
${
BUILD_FOR_DEPLOYMENT
}
)
set
(
libstdcpp
${
CMAKE_BINARY_DIR
}
/libstdc++.a
)
...
...
@@ -87,14 +87,15 @@ set(SPELL_PEDIGREE_SRC
)
set
(
SPELL_MARKER_SRC
src/input/read_mark.cc
src/input/design.cc
src/input/read_map.cc
#src/input/xml/xml_design.cc src/input/xml/xml_format.cc
src/input/read_mark.cc src/input/read_map.cc
#
src/input/design.cc
src/input/xml/xml_design.cc src/input/xml/xml_format.cc
src/static_data.cc
src/bayes/main.cc src/bayes/dispatch.cc src/bayes/jobs.cc src/bayes/cli.cc
)
set
(
SPELL_QTL_SRC
src/input/read_map.cc src/input/read_trait.cc src/input/read_settings.cc src/input/ld_matrices.cc src/input/xml/xml_format.cc src/input/xml/xml_settings.cc
src/input/read_map.cc src/input/read_trait.cc src/input/read_settings.cc src/input/ld_matrices.cc
# src/input/xml/xml_format.cc src/input/xml/xml_settings.cc
src/static_data.cc src/main.cc src/beta_gamma.cc
src/computations/basic_data.cc src/computations/probabilities.cc src/computations/model.cc src/computations/frontends.cc
)
...
...
include/x2c.h
View file @
143174a8
...
...
@@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define _SPEL_X2C_PROXY_H_
#ifndef _SPEL_X2C_PROXY_H_
#define _SPEL_X2C_PROXY_H_
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment