Skip to content

Commit

Permalink
last changes before release
Browse files Browse the repository at this point in the history
  • Loading branch information
Ithanil committed Feb 24, 2019
1 parent b1e21de commit 50c6ce3
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
mkdir -p build && cd build
cmake -DCMAKE_CXX_COMPILER="${CXX_COMPILER}" -DUSER_CXX_FLAGS="${CXX_FLAGS}" -DUSE_COVERAGE="${USE_COVERAGE}" -DUSE_MPI="${USE_MPI}" -DMCI_ROOT_DIR="${MCI_ROOT}" -DNFM_ROOT_DIR="${NFM_ROOT}" -DGSL_ROOT_DIR="${GSL_ROOT}" ..

if [ "$1" == "" ]; then
if [ "$1" = "" ]; then
make -j$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
else
make -j$1
Expand Down
2 changes: 1 addition & 1 deletion doc/doxygen/doxygen.conf
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ WARN_LOGFILE =
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
# Note: If this tag is empty the current directory is searched.

INPUT = "../../include" \
INPUT = "../../include/vmc" \
"../../src" \
"doxygen_stl.cpp"

Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ file(GLOB SOURCES "*.cpp")
add_library(vmc SHARED ${SOURCES})
target_link_libraries(vmc "${MCI_LIBRARY_DIR}" "${NFM_LIBRARY_DIR}" "${GSL_LIBRARIES}" "${MPI_CXX_LIBRARIES}") # shared libs
add_library(vmc_static STATIC ${SOURCES})
target_link_libraries(vmc_static "${MCI_STATIC_LIBRARY_DIR}" "${NFM_STATIC_LIBRARY_DIR}" "{$GSL_LIBRARIES}" "${MPI_CXX_LIBRARIES}") # static (+ some shared) libs
target_link_libraries(vmc_static "${MCI_STATIC_LIBRARY_DIR}" "${NFM_STATIC_LIBRARY_DIR}" "${GSL_LIBRARIES}" "${MPI_CXX_LIBRARIES}") # static (+ some shared) libs

0 comments on commit 50c6ce3

Please sign in to comment.