Skip to content

Commit e6773d3

Browse files
author
Roberto Di Remigio
committed
Correct dependencies between targets + fix .travis.yml on OS X
1 parent 51d2d45 commit e6773d3

File tree

8 files changed

+3
-2
lines changed

8 files changed

+3
-2
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,11 @@ install:
213213
CMAKE_URL="http://www.cmake.org/files/v3.3/cmake-3.3.2-Linux-x86_64.tar.gz"
214214
mkdir cmake && travis_retry wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
215215
export PATH=${DEPS_DIR}/cmake/bin:${PATH}
216+
pip install --upgrade ${PYTHON_PACKAGES} --user `whoami`
216217
elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
217218
brew install cmake boost python gcc
219+
pip install --upgrade ${PYTHON_PACKAGES}
218220
fi
219-
pip install --upgrade ${PYTHON_PACKAGES} --user `whoami`
220221
221222
before_script:
222223
- cd ${TRAVIS_BUILD_DIR}

doc/gfx/bi_operators.png

-93 Bytes
Loading

doc/gfx/cavity.png

18 Bytes
Loading

doc/gfx/dielectric_profile.png

-197 Bytes
Loading

doc/gfx/green.png

-116 Bytes
Loading

doc/gfx/interface.png

33 Bytes
Loading

doc/gfx/pedra.png

592 Bytes
Loading

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ get_property(_pcmsolver_cxx_sources GLOBAL PROPERTY PCMSolver_CXX_SOURCES)
2020
get_property(_pcmsolver_c_sources GLOBAL PROPERTY PCMSolver_C_SOURCES)
2121
get_property(_pcmsolver_fortran_sources GLOBAL PROPERTY PCMSolver_Fortran_SOURCES)
2222
add_library(pcm ${_pcmsolver_cxx_sources} ${_pcmsolver_c_sources} ${_pcmsolver_fortran_sources})
23+
add_dependencies(pcm libgetkw)
2324
if(BUILD_CUSTOM_BOOST)
24-
add_dependencies(pcm libgetkw)
2525
add_dependencies(pcm custom_boost)
2626
endif()
2727
install(TARGETS pcm ARCHIVE DESTINATION lib)

0 commit comments

Comments
 (0)