Add some verbose output

oscar-system · Aug 13, 2020 · d3f9ada · d3f9ada
1 parent 17dae32
commit d3f9ada
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/deps/build.jl b/deps/build.jl
@@ -103,7 +103,8 @@ rm(cmake_build_path, recursive = true, force = true)
 mkpath(cmake_build_path)
 cd(cmake_build_path)
 
-@show mpfr_dir
+@show "$mpfr_dir/lib"
+@show "$gmp_dir/lib"
 
 println("Initializing cmake")
 run(`$(CMake.cmake)
@@ -113,10 +114,8 @@ run(`$(CMake.cmake)
     -Dsingular_includes=$prefixpath/include
     -Dsingular_libdir=$prefixpath/lib
     -DCMAKE_INSTALL_LIBDIR=$localprefixpath/lib
-    -Dgmp_dir=$gmp_dir/lib
-    -Dgmp_inc=$gmp_dir/include
-    -Dmpfr_dir=$mpfr_dir/lib
-    -Dmpfr_inc=$mpfr_dir/include
+    -Dgmp_dir=$gmp_dir
+    -Dmpfr_dir=$mpfr_dir
     $cmake_src_path`)
 
 println("Running cmake")

diff --git a/deps/src/CMakeLists.txt b/deps/src/CMakeLists.txt
@@ -15,8 +15,8 @@ message(STATUS "Found JlCxx at ${JlCxx_location}")
 include_directories(${singular_includes})
 include_directories(${singular_includes}/singular)
 
-SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g ${extra_cppflags} -I${gmp_inc} -I${mpfr_inc}" )
-SET( CMAKE_SHARED_LINKER_FLAGS  "${CMAKE_SHARED_LINKER_FLAGS} -L${singular_libdir} -Wl,-rpath,${singular_libdir} -Wl,-rpath,${gmp_dir} -Wl,-rpath,${mpfr_dir}" )
+SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g ${extra_cppflags} -I${gmp_dir}/include -I${mpfr_dir}/include" )
+SET( CMAKE_SHARED_LINKER_FLAGS  "${CMAKE_SHARED_LINKER_FLAGS} -v -L${singular_libdir} -L${gmp_dir}/lib -L${mpfr_dir}/lib -Wl,-rpath,${singular_libdir} -Wl,-rpath,${gmp_dir}/lib -Wl,-rpath,${mpfr_dir}/lib" )
 
 
 add_library(singularwrap SHARED singular.cpp rings.cpp coeffs.cpp ideals.cpp matrices.cpp caller.cpp coeff_rings.cpp threading.cpp)