Modify .gitlan-ci.yml and target_link_libraries directives

PCMSolver · Sep 23, 2015 · 72aafcd · 72aafcd
1 parent ec02c12
commit 72aafcd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,6 +1,4 @@
 before_script:
-    - git clone git@gitlab.com:PCMSolver/pcmsolver.git /pcmsolver-ci/tmp
-    - cd /pcmsolver-ci/tmp
     - ls -la
     - sudo apt-get update -y
     - sudo apt-get install gcc g++ gfortran make cmake zlib1g-dev python-dateutil python-pyparsing python-numpy python-matplotlib python-pip python-setuptools python-dev -y

diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
@@ -7,26 +7,26 @@ list(APPEND external_libraries ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY} ${
 #target_link_libraries(debug_wavcav.x solver cavity wavcav pwl wem utils)
 
 #add_executable(plot_green_spherical.x plot_green_spherical.cpp)
-#target_link_libraries(plot_green_spherical.x utils "${external_libraries}")
+#target_link_libraries(plot_green_spherical.x utils ${external_libraries})
 
 #add_executable(plot_green_spherical-CASE1.x plot_green_spherical-CASE1.cpp)
-#target_link_libraries(plot_green_spherical-CASE1.x utils "${external_libraries}")
+#target_link_libraries(plot_green_spherical-CASE1.x utils ${external_libraries})
 #add_executable(plot_green_spherical-CASE2.x plot_green_spherical-CASE2.cpp)
-#target_link_libraries(plot_green_spherical-CASE2.x utils "${external_libraries}")
+#target_link_libraries(plot_green_spherical-CASE2.x utils ${external_libraries})
 #add_executable(plot_green_spherical-CASE3.x plot_green_spherical-CASE3.cpp)
-#target_link_libraries(plot_green_spherical-CASE3.x utils "${external_libraries}")
+#target_link_libraries(plot_green_spherical-CASE3.x utils ${external_libraries})
 #add_executable(plot_green_spherical-CASE4.x plot_green_spherical-CASE4.cpp)
-#target_link_libraries(plot_green_spherical-CASE4.x utils "${external_libraries}")
+#target_link_libraries(plot_green_spherical-CASE4.x utils ${external_libraries})
 
 #add_executable(check_Coulomb_coefficient.x check_Coulomb_coefficient.cpp)
-#target_link_libraries(check_Coulomb_coefficient.x utils "${external_libraries}")
+#target_link_libraries(check_Coulomb_coefficient.x utils ${external_libraries})
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 list(APPEND external_libraries ${ZLIB_LIBRARIES})
 add_executable(run_pcm.x run_pcm.cpp)
 if(BUILD_CUSTOM_BOOST)
     add_dependencies(run_pcm.x custom_boost)
 endif()
-target_link_libraries(run_pcm.x pcm getkw "${external_libraries}" "${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES}")
+target_link_libraries(run_pcm.x pcm getkw ${external_libraries})
 set_property(GLOBAL PROPERTY PCMSolver_EXECUTABLE ${PROJECT_BINARY_DIR}/bin/run_pcm.x)
 unset(CMAKE_RUNTIME_OUTPUT_DIRECTORY)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -17,4 +17,4 @@ add_subdirectory(iefpcm)
 get_property(test_sources GLOBAL PROPERTY TestSources)
 
 add_executable(unit_tests.x unit_tests.cpp ${test_sources})
-target_link_libraries(unit_tests.x pcm getkw ${ZLIB_LIBRARIES})
+target_link_libraries(unit_tests.x pcm getkw ${ZLIB_LIBRARIES} ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY})
diff --git a/tests/bi_operators/CMakeLists.txt b/tests/bi_operators/CMakeLists.txt
@@ -14,5 +14,5 @@ add_test(NAME bi_operators_purisima COMMAND unit_tests.x [bi_operators_purisima]
 # The reference are to be copied into the source directory for the tests
 list(APPEND external_libraries ${ZLIB_LIBRARIES} ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY})
 add_executable(update_reference_files.x update_reference_files.cpp)
-target_link_libraries(update_reference_files.x pcm "${external_libraries}")
+target_link_libraries(update_reference_files.x pcm ${external_libraries})