Fix CI build (#296)

LibreCAD · May 22, 2020 · 0f69a1b · 0f69a1b
1 parent 00d7522
commit 0f69a1b
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -36,6 +36,7 @@ matrix:
       - pip install --user cpp-coveralls
 
       script:
+      - cmake --version
       - ./scripts/travis.sh
 
 cache: ccache

diff --git a/lcadluascript/CMakeLists.txt b/lcadluascript/CMakeLists.txt
@@ -82,5 +82,7 @@ add_library(lcluascript SHARED ${lcluascript_srcs} ${lcluascript_hdrs})
 target_link_libraries(lcluascript ${LUA_LIBRARIES} lckernel)
 
 # INSTALLATION
-install(TARGETS lcluascript RUNTIME DESTINATION lib)
-install(TARGETS lcluascript RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+install(TARGETS lcluascript 
+	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+)
diff --git a/lckernel/CMakeLists.txt b/lckernel/CMakeLists.txt
@@ -259,5 +259,6 @@ add_library(lckernel SHARED ${lckernel_srcs} ${lckernel_hdrs})
 target_link_libraries(lckernel ${Boost_LIBRARIES} ${APR_LIBRARIES} ${G_EXTRA_LIBS} tinysplinecxx_shared)
 
 # INSTALLATION
-install(TARGETS lckernel RUNTIME DESTINATION lib)
-install(TARGETS lckernel RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+install(TARGETS lckernel 
+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} 
+	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/lckernel/tinyspline b/lckernel/tinyspline
diff --git a/lcviewernoqt/CMakeLists.txt b/lcviewernoqt/CMakeLists.txt
@@ -215,5 +215,7 @@ ${PNG_LIBRARIES}
 ${BZIP2_LIBRARIES})
 
 # INSTALLATION
-install(TARGETS lcviewernoqt RUNTIME DESTINATION lib)
-install(TARGETS lcviewernoqt RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+install(TARGETS lcviewernoqt
+        ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+        LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+)
diff --git a/persistence/CMakeLists.txt b/persistence/CMakeLists.txt
@@ -70,5 +70,7 @@ add_library(persistence SHARED ${persistence_srcs} ${persistence_hdrs})
 target_link_libraries(persistence lckernel ${Boost_LIBRARIES} libdxfrw::libdxfrw ${Boost_LIBRARIES} ${APR_LIBRARIES} ${OPENCAD_LIB})
 
 # INSTALLATION
-install(TARGETS persistence RUNTIME DESTINATION lib)
-install(TARGETS persistence RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+install(TARGETS persistence
+        ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+        LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+)
diff --git a/scripts/travis.sh b/scripts/travis.sh
@@ -8,12 +8,12 @@ make -j2
 cd ..
 git clone https://github.com/LibreCAD/libdxfrw.git libdxfrw
 cd libdxfrw
-cmake .
+cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON .
 make -j2
 cd ../..
 mkdir -p build
 cd build
-cmake -DWITH_COVERAGE=ON ..
+cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DWITH_COVERAGE=ON ..
 
 
 make -j2 lcunittest VERBOSE=1
+0 −28		.appveyor.yml
+66 −17		.travis.yml
+29 −20		README.md
+1 −1		docs/mkdocs/docs/getting-started.md.in
+1 −1		examples/CMakeLists.txt
+15 −25		examples/c/CMakeLists.txt
+1 −0		examples/c/beziers.c
+4 −3		examples/c/debugging.h
+2 −1		examples/c/derivative.c
+2 −2		examples/c/interpolation.c
+0 −309		examples/c/interpolation_derivative.c
+1 −1		examples/c/json_export.c
+2 −1		examples/c/quickstart.c
+15 −15		examples/c/tension.c
+5 −5		examples/csharp/QuickStart.cs
+7 −3		examples/cxx/CMakeLists.txt
+1 −1		examples/cxx/quickstart.cpp
+4 −4		examples/cxx/time_series.cpp
+1 −1		examples/java/Swing.java
+1 −1		examples/lua/quickstart.lua
+2 −2		examples/octave/quickstart.m
+51 −0		examples/python/spline_as_lines.py
+1 −1		examples/r/interpolation.R
+557 −302		src/CMakeLists.txt
+69 −108		src/cmake/FindOctave.cmake
+41 −56		src/cmake/FindPHP.cmake
+31 −48		src/cmake/FindR.cmake
+0 −0		src/pkg/.nuspec.in
+1 −1		src/pkg/dub.json.in
+62 −2		src/pkg/pom.xml.in
+2 −1		src/pkg/setup.py.in
+26 −0		src/pkg/tinyspline-config.cmake.in
+4 −2		src/pkg/tinyspline.gemspec.in
+12 −0		src/pkg/tinyspline.pc.in
+33 −0		src/pkg/tinyspline.rockspec.in
+26 −0		src/pkg/tinysplinecxx-config.cmake.in
+12 −0		src/pkg/tinysplinecxx.pc.in
+6 −2		src/swig/tinyspline.i
+9 −0		src/swig/tinysplinecsharp.i
+4 −0		src/swig/tinysplinedlang.i
+14 −8		src/swig/tinysplinego.i
+339 −0		src/swig/tinysplinejava.i
+4 −0		src/swig/tinysplinelua.i
+0 −0		src/swig/tinysplinenodejs.i
+0 −0		src/swig/tinysplineoctave.i
+4 −0		src/swig/tinysplinephp.i
+4 −0		src/swig/tinysplinepython.i
+1 −0		src/swig/tinyspliner.i
+7 −0		src/swig/tinysplineruby.i
+479 −218		src/tinyspline.c
+362 −303		src/tinyspline.h
+0 −27		src/tinyspline.rockspec.in
+130 −50		src/tinysplinecxx.cxx
+34 −13		src/tinysplinecxx.h
+0 −150		src/tinysplinejava.i
+16 −24		test/CMakeLists.txt
+7 −11		test/c/CMakeLists.txt
+505 −0		test/c/bisect.c
+585 −0		test/c/derive.c
+1 −2		test/c/free.c
+6 −6		test/c/insert_knot.c
+167 −0		test/c/interpolation.c
+1 −1		test/c/move.c
+2 −2		test/c/new.c
+235 −0		test/c/sample.c
+281 −0		test/c/set_knots.c
+0 −191		test/c/setter.c
+13 −3		test/c/tests.c
+89 −0		test/c/to_beziers.c
+4 −0		tools/ci/.gitignore
+6 −5		tools/ci/build.linux-x86_64.sh
+10 −4		tools/ci/build.macosx-x86_64.sh
+0 −104		tools/ci/build.ps1
+145 −0		tools/ci/build.windows-x86_64.sh
+131 −7		tools/ci/bundle.sh
+22 −0		tools/release/maven.sh