Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP Move this supplement to 6.1 support #2

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,16 @@ before_install:
- gmt-config --all

install:
- gmt --version
- mkdir build
- cd build
- cmake ..
- make
- cd ..

script:
- gmt --version
- gmt set GMT_CUSTOM_LIBS ${PWD}/build/src/plugins/custom.so
- gmt --version -Vd
- gmt average

notifications:
email: false
30 changes: 9 additions & 21 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#
# $Id: CMakeLists.txt 11803 2013-06-24 23:06:22Z pwessel $
#
# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
# Copyright (c) 1991-2020 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
# See LICENSE.TXT file for copying and redistribution conditions.
#
# This program is free software; you can redistribute it and/or modify
Expand All @@ -13,11 +11,9 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# Contact info: gmt.soest.hawaii.edu
# Contact info: www.generic-mapping-tools.org
#-------------------------------------------------------------------------------
#
# To modify the cmake process: Edit your cmake/ConfigUser.cmake file
#
# To build out-of-source do (for example):
#
# mkdir build
Expand All @@ -26,14 +22,10 @@
#
# CMAKE_BUILD_TYPE can be: empty, Debug, Release, RelWithDebInfo or MinSizeRel
#
# cmake creates a new file cmake/ConfigUser.cmake if it does not already
# exist. You can configure additional options there.
#

## Section 0: Define project name. Change this to what your plugin should be named.
## Define project name. Change this to what your plugin should be named.
project (custom)

#------------------------------------------------------------------------
# Make sure the user doesn't play dirty with symlinks
get_filename_component (srcdir "${CMAKE_SOURCE_DIR}" REALPATH)
get_filename_component (bindir "${CMAKE_BINARY_DIR}" REALPATH)
Expand All @@ -54,16 +46,14 @@ cmake_minimum_required (VERSION 2.8.5)
set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/"
CACHE INTERNAL "Location of our custom CMake modules." FORCE)

# Include configuration options (default options and options overridden by user).
include (ConfigCMake)

# Find UNIX commands
include (FindUnixCommands)

# Add subdirectories
add_subdirectory (src)
get_property(GMT_CUSTOM_LIB_PATH TARGET customlib PROPERTY LOCATION)
GET_FILENAME_COMPONENT (GMT_CUSTOM_LIB_NAME ${GMT_CUSTOM_LIB_PATH} NAME)

# Get name of the custom supplemental library
get_directory_property (_suppl_lib_name DIRECTORY "src" DEFINITION "SUPPL_LIB_NAME")
get_target_property (_name ${_suppl_lib_name} OUTPUT_NAME)
get_target_property (_prefix ${_suppl_lib_name} PREFIX)
set (GMT_CUSTOM_LIB_NAME ${_prefix}${_name}${CMAKE_SHARED_MODULE_SUFFIX})

# Configuration done
message(
Expand All @@ -76,5 +66,3 @@ message(
"* CUSTOM library : ${GMT_CUSTOM_LIB_NAME}\n"
"* Installing CUSTOM in : ${CMAKE_INSTALL_PREFIX}\n"
"* CUSTOM_SHARE_PATH : ${CMAKE_INSTALL_PREFIX}/${CUSTOM_SHARE_PATH}")

# vim: textwidth=78 noexpandtab tabstop=2 softtabstop=2 shiftwidth=2
128 changes: 0 additions & 128 deletions cmake/ConfigDefault.cmake

This file was deleted.

79 changes: 0 additions & 79 deletions cmake/ConfigUserTemplate.cmake

This file was deleted.

Loading