Skip to content

Commit

Permalink
Fix lib name on linux
Browse files Browse the repository at this point in the history
  • Loading branch information
saradickinson committed Nov 14, 2019
1 parent 8b3e341 commit 1cca550
Show file tree
Hide file tree
Showing 15 changed files with 20 additions and 292 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ add_executable(@TPKG_NAME@ @TPKG_NAME@.c)
target_include_directories(@TPKG_NAME@ PRIVATE @BUILDDIR@)

add_library(libgetdns SHARED IMPORTED )
set_target_properties(libgetdns PROPERTIES IMPORTED_LOCATION @BUILDDIR@/libgetdns.dylib )
set_target_properties(libgetdns PROPERTIES IMPORTED_LOCATION @BUILDDIR@/libgetdns.so )
target_link_libraries(@TPKG_NAME@ libgetdns)
4 changes: 4 additions & 0 deletions src/test/tpkg/250-json-pointers.tpkg/250-json-pointers.pre
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@
sed -e "s/@BUILDDIR@/${BUILDDIR4SED}/g" \
-e "s/@TPKG_NAME@/${TPKG_NAME}/g" "${TPKG_NAME}.cmake"
) > CMakeLists.txt

if [[ "$OSTYPE" == "darwin"* ]]; then
sed -i '' -e "s/libgetdns.so/libgetdns.dylib/g" CMakeLists.txt
fi
111 changes: 0 additions & 111 deletions src/test/tpkg/255-yaml-config.tpkg/255-yaml-config.c

This file was deleted.

9 changes: 0 additions & 9 deletions src/test/tpkg/255-yaml-config.tpkg/255-yaml-config.cmake

This file was deleted.

16 changes: 0 additions & 16 deletions src/test/tpkg/255-yaml-config.tpkg/255-yaml-config.dsc

This file was deleted.

87 changes: 0 additions & 87 deletions src/test/tpkg/255-yaml-config.tpkg/255-yaml-config.good

This file was deleted.

47 changes: 0 additions & 47 deletions src/test/tpkg/255-yaml-config.tpkg/255-yaml-config.input

This file was deleted.

11 changes: 0 additions & 11 deletions src/test/tpkg/255-yaml-config.tpkg/255-yaml-config.pre

This file was deleted.

7 changes: 0 additions & 7 deletions src/test/tpkg/255-yaml-config.tpkg/255-yaml-config.test

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ add_executable(@TPKG_NAME@ @TPKG_NAME@.c)
target_include_directories(@TPKG_NAME@ PRIVATE @BUILDDIR@)

add_library(libgetdns SHARED IMPORTED )
set_target_properties(libgetdns PROPERTIES IMPORTED_LOCATION @BUILDDIR@/libgetdns.dylib )
set_target_properties(libgetdns PROPERTIES IMPORTED_LOCATION @BUILDDIR@/libgetdns.so )
target_link_libraries(@TPKG_NAME@ libgetdns)
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@
sed -e "s/@BUILDDIR@/${BUILDDIR4SED}/g" \
-e "s/@TPKG_NAME@/${TPKG_NAME}/g" "${TPKG_NAME}.cmake"
) > CMakeLists.txt

if [[ "$OSTYPE" == "darwin"* ]]; then
sed -i '' -e "s/libgetdns.so/libgetdns.dylib/g" CMakeLists.txt
fi
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ add_executable(@TPKG_NAME@ @TPKG_NAME@.c)
target_include_directories(@TPKG_NAME@ PRIVATE @BUILDDIR@)

add_library(libgetdns SHARED IMPORTED )
set_target_properties(libgetdns PROPERTIES IMPORTED_LOCATION @BUILDDIR@/libgetdns.dylib )
set_target_properties(libgetdns PROPERTIES IMPORTED_LOCATION @BUILDDIR@/libgetdns.so )
target_link_libraries(@TPKG_NAME@ libgetdns)
4 changes: 4 additions & 0 deletions src/test/tpkg/265-supported-rrs.tpkg/265-supported-rrs.pre
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@
sed -e "s/@BUILDDIR@/${BUILDDIR4SED}/g" \
-e "s/@TPKG_NAME@/${TPKG_NAME}/g" "${TPKG_NAME}.cmake"
) > CMakeLists.txt

if [[ "$OSTYPE" == "darwin"* ]]; then
sed -i '' -e "s/libgetdns.so/libgetdns.dylib/g" CMakeLists.txt
fi
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ add_executable(@TPKG_NAME@ @TPKG_NAME@.c)
target_include_directories(@TPKG_NAME@ PRIVATE @BUILDDIR@)

add_library(libgetdns SHARED IMPORTED )
set_target_properties(libgetdns PROPERTIES IMPORTED_LOCATION @BUILDDIR@/libgetdns.dylib )
set_target_properties(libgetdns PROPERTIES IMPORTED_LOCATION @BUILDDIR@/libgetdns.so )
target_link_libraries(@TPKG_NAME@ libgetdns)
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@
sed -e "s/@BUILDDIR@/${BUILDDIR4SED}/g" \
-e "s/@TPKG_NAME@/${TPKG_NAME}/g" "${TPKG_NAME}.cmake"
) > CMakeLists.txt

if [[ "$OSTYPE" == "darwin"* ]]; then
sed -i '' -e "s/libgetdns.so/libgetdns.dylib/g" CMakeLists.txt
fi

0 comments on commit 1cca550

Please sign in to comment.