From a441b0f0dc822c924ea0b7bb02b6b05534320ba6 Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 3 Apr 2018 17:38:30 +0200 Subject: [PATCH 1/3] Add PKG_LINK and PKG_FLAGS from plplot pkgconfig --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 167aa4d..011c54c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,6 +77,8 @@ if( CREATE_SHAREDLIB ) set_target_properties( pg2plplot_shared PROPERTIES OUTPUT_NAME "pg2plplot" ) endif( COMPILER_SPECIFIC_LIBS ) set_target_properties( pg2plplot_shared PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY} ) + 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 ) @@ -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 ) From 59733cc5eac2a5345d37606e9acf024835ec2b68 Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 3 Apr 2018 17:40:56 +0200 Subject: [PATCH 2/3] Add MODULEDIR env variable to allow for overriding of plplot module path --- CMake/CMakeLocations.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMake/CMakeLocations.cmake b/CMake/CMakeLocations.cmake index 08ba7db..1c47a26 100644 --- a/CMake/CMakeLocations.cmake +++ b/CMake/CMakeLocations.cmake @@ -29,7 +29,7 @@ # User's home directory: set( HOME $ENV{HOME} ) - +set( MODULEDIR $ENV{MODULEDIR} ) set( search_locations /usr @@ -37,6 +37,7 @@ set( search_locations /opt /opt/local /sw + ${MODULEDIR}/plplot ${HOME}/usr CACHE PATH @@ -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" From bcab1017d4f075f7273f422515418b585d917796 Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 3 Apr 2018 17:41:35 +0200 Subject: [PATCH 3/3] Add soname number 0 to get standardized shared library --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 011c54c..6451558 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,7 +76,7 @@ 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 )