Skip to content

Minor improvements over 5.13.0 #6

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.

Sign up for GitHub

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

Open
eatdust wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Minor improvements over 5.13.0 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a441b0f
Add PKG_LINK and PKG_FLAGS from plplot pkgconfig
Apr 3, 2018
59733cc
Add MODULEDIR env variable to allow for overriding of plplot module path
Apr 3, 2018
bcab101
Add soname number 0 to get standardized shared library
Apr 3, 2018
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
4 changes: 3 additions & 1 deletion CMake/CMakeLocations.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@

# User's home directory:
set( HOME $ENV{HOME} )
set( MODULEDIR $ENV{MODULEDIR} )

set( search_locations
/usr
/usr/local
/opt
/opt/local
/sw
${MODULEDIR}/plplot
${HOME}/usr
CACHE
PATH
Expand Down Expand Up @@ -77,6 +78,7 @@ set( include_locations
${HOME}/usr/include
${HOME}/include
${HOME}/lib/fortran/modules
${MODULEDIR}/plplot
CACHE
PATH
"Directories to look for include files"
Expand Down
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ if( CREATE_SHAREDLIB )
else( COMPILER_SPECIFIC_LIBS )
set_target_properties( pg2plplot_shared PROPERTIES OUTPUT_NAME "pg2plplot" )
endif( COMPILER_SPECIFIC_LIBS )
set_target_properties( pg2plplot_shared PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY} )
set_target_properties( pg2plplot_shared PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY} SOVERSION 0)
execute_process(COMMAND pkg-config --libs plplot-fortran OUTPUT_VARIABLE PKG_LINK OUTPUT_STRIP_TRAILING_WHITESPACE)
target_link_libraries( pg2plplot_shared ${PKG_LINK})
endif( CREATE_SHAREDLIB )

if( CREATE_STATICLIB )
Expand All @@ -87,6 +89,7 @@ if( CREATE_STATICLIB )
set_target_properties( pg2plplot_static PROPERTIES OUTPUT_NAME "pg2plplot" )
endif( COMPILER_SPECIFIC_LIBS )
set_target_properties( pg2plplot_static PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY} )
execute_process(COMMAND pkg-config --cflags plplot-fortran OUTPUT_VARIABLE PKG_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
endif( CREATE_STATICLIB )


Expand Down