Fix visibility header

Author: robertodr

.magnum.yml

@@ -17,7 +17,7 @@ before_install:
   - gfortran --version
   - python --version
 script:
-  - python setup.py --cxx=g++ --cc=gcc --fc=gfortran --type=debug --cmake-options='-Hprojects/CMake -DENABLE_FORTRAN_API=ON'
+  - python setup.py --cxx=g++ --cc=gcc --fc=gfortran --type=debug --cmake-options='-Hprojects/CMake'
   - cd build
   - VERBOSE=1 make
   - ctest -V

.travis.yml

@@ -235,9 +235,9 @@ before_script:
 - python --version
 - |
   if [[ "${COVERAGE}" = true ]]; then
-    python setup.py --cxx=${CXX_COMPILER} --cc=${C_COMPILER} --fc=${Fortran_COMPILER} --type=${BUILD_TYPE} --cmake-options='-Hprojects/CMake -DENABLE_FORTRAN_API=ON' --coverage
+    python setup.py --cxx=${CXX_COMPILER} --cc=${C_COMPILER} --fc=${Fortran_COMPILER} --type=${BUILD_TYPE} --cmake-options='-Hprojects/CMake' --coverage
   else
-    python setup.py --cxx=${CXX_COMPILER} --cc=${C_COMPILER} --fc=${Fortran_COMPILER} --type=${BUILD_TYPE} --cmake-options='-Hprojects/CMake -DENABLE_FORTRAN_API=ON'
+    python setup.py --cxx=${CXX_COMPILER} --cc=${C_COMPILER} --fc=${Fortran_COMPILER} --type=${BUILD_TYPE} --cmake-options='-Hprojects/CMake'
   fi
 - cd build
 script:

CMakeLists.txt

@@ -40,6 +40,7 @@ include(autocmake_omp)
 include(autocmake_safeguards)
 include(autocmake_python_interpreter)
 include(pcmsolver)
+include(api)
 include(autocmake_git_info)
 include(autocmake_boost)
 include(version)
@@ -51,7 +52,6 @@ include(zlib)
 include(autogenerated)
 include(documentation)
 include(export)
-include(api)
 include(autocmake_src)
 include(test)
 include(summary)

api/CMakeLists.txt

@@ -0,0 +1,7 @@
+install(FILES ${PROJECT_SOURCE_DIR}/api/pcmsolver.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
+install(FILES ${PROJECT_SOURCE_DIR}/api/PCMInput.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
+
+if(ENABLE_FORTRAN_API)
+    add_library(fortran_bindings OBJECT ${PROJECT_SOURCE_DIR}/api/pcmsolver.f90)
+    list(APPEND _objects $<TARGET_OBJECTS:fortran_bindings>)
+endif()

api/pcmsolver.h

@@ -26,24 +26,9 @@
 
 #include <stddef.h>
 #include "PCMInput.h"
+#include "PCMSolverExport.h"
 
-#ifndef PCMSOLVER_API
-#ifdef _WIN32
-#if defined(PCMSOLVER_BUILD_SHARED) /* build dll */
-#define PCMSOLVER_API __declspec(dllexport)
-#elif !defined(PCMSOLVER_BUILD_STATIC) /* use dll */
-#define PCMSOLVER_API __declspec(dllimport)
-#else /* static library */
-#define PCMSOLVER_API
-#endif
-#else
-#if __GNUC__ >= 4
-#define PCMSOLVER_API __attribute__((visibility("default")))
-#else
-#define PCMSOLVER_API
-#endif
-#endif
-#endif
+#define PCMSolver_API PCMSolver_EXPORT
 
 // To cope with the fact that C doesn't have bool as primitive type
 #ifndef pcmsolver_bool_t_DEFINED
@@ -108,7 +93,7 @@ typedef void (*HostWriter)(const char * message);
  *  of 4 integers: number of generators, first, second and third generator
  *  respectively. Generators map to integers as in table :ref:`symmetry-ops`
  */
-PCMSOLVER_API pcmsolver_context_t * pcmsolver_new(pcmsolver_reader_t input_reading,
+PCMSolver_API pcmsolver_context_t * pcmsolver_new(pcmsolver_reader_t input_reading,
                                                   int nr_nuclei, double charges[],
                                                   double coordinates[],
                                                   int symmetry_info[],
@@ -118,56 +103,56 @@ PCMSOLVER_API pcmsolver_context_t * pcmsolver_new(pcmsolver_reader_t input_readi
 /*! \brief Deletes a PCM context object
  *  \param[in, out] context the PCM context object to be deleted
  */
-PCMSOLVER_API void pcmsolver_delete(pcmsolver_context_t * context);
+PCMSolver_API void pcmsolver_delete(pcmsolver_context_t * context);
 
 /*! \brief Whether the library is compatible with the header file
  *  Checks that the compiled library and header file version match.
  *  Host should abort when that is not the case.
  *  \warning This function should be called **before** instantiating
  *  any PCM context objects.
  */
-PCMSOLVER_API pcmsolver_bool_t pcmsolver_is_compatible_library(void);
+PCMSolver_API pcmsolver_bool_t pcmsolver_is_compatible_library(void);
 
 /*! \brief Prints citation and set up information
  *  \param[in, out] context the PCM context object
  */
-PCMSOLVER_API void pcmsolver_print(pcmsolver_context_t * context);
+PCMSolver_API void pcmsolver_print(pcmsolver_context_t * context);
 
 /*! \brief Getter for the number of finite elements composing the molecular cavity
  *  \param[in, out] context the PCM context object
  *  \return the size of the cavity
  */
-PCMSOLVER_API int pcmsolver_get_cavity_size(pcmsolver_context_t * context);
+PCMSolver_API int pcmsolver_get_cavity_size(pcmsolver_context_t * context);
 
 /*! \brief Getter for the number of irreducible finite elements composing the
  * molecular cavity
  *  \param[in, out] context the PCM context object
  *  \return the number of irreducible finite elements
  */
-PCMSOLVER_API int pcmsolver_get_irreducible_cavity_size(
+PCMSolver_API int pcmsolver_get_irreducible_cavity_size(
     pcmsolver_context_t * context);
 
 /*! \brief Getter for the centers of the finite elements composing the molecular
  * cavity
  *  \param[in, out] context the PCM context object
  *  \param[out] centers array holding the coordinates of the finite elements centers
  */
-PCMSOLVER_API void pcmsolver_get_centers(pcmsolver_context_t * context,
+PCMSolver_API void pcmsolver_get_centers(pcmsolver_context_t * context,
                                          double centers[]);
 
 /*! \brief Getter for the center of the i-th finite element
  *  \param[in, out] context the PCM context object
  *  \param[in] its index of the finite element
  *  \param[out] center array holding the coordinates of the finite element center
  */
-PCMSOLVER_API void pcmsolver_get_center(pcmsolver_context_t * context, int its,
+PCMSolver_API void pcmsolver_get_center(pcmsolver_context_t * context, int its,
                                         double center[]);
 
 /*! \brief Getter for the areas/weights of the finite elements
  *  \param[in, out] context the PCM context object
  *  \param[out] areas array holding the weights/areas of the finite elements
  */
-PCMSOLVER_API void pcmsolver_get_areas(pcmsolver_context_t * context,
+PCMSolver_API void pcmsolver_get_areas(pcmsolver_context_t * context,
                                        double areas[]);
 
 /*! \brief Computes ASC given a MEP and the desired irreducible representation
@@ -179,7 +164,7 @@ PCMSOLVER_API void pcmsolver_get_areas(pcmsolver_context_t * context,
  *  and charges. Given labels for each, this function retrieves the MEP
  *  and computes the corresponding ASC.
  */
-PCMSOLVER_API void pcmsolver_compute_asc(pcmsolver_context_t * context,
+PCMSolver_API void pcmsolver_compute_asc(pcmsolver_context_t * context,
                                          const char * mep_name,
                                          const char * asc_name, int irrep);
 
@@ -194,7 +179,7 @@ PCMSOLVER_API void pcmsolver_compute_asc(pcmsolver_context_t * context,
  * permittivity
  *  otherwise.
  */
-PCMSOLVER_API void pcmsolver_compute_response_asc(pcmsolver_context_t * context,
+PCMSolver_API void pcmsolver_compute_response_asc(pcmsolver_context_t * context,
                                                   const char * mep_name,
                                                   const char * asc_name, int irrep);
 
@@ -205,7 +190,7 @@ PCMSOLVER_API void pcmsolver_compute_response_asc(pcmsolver_context_t * context,
  *  \return the polarization energy
  *  This function calculates the dot product of the given MEP and ASC vectors.
  */
-PCMSOLVER_API double pcmsolver_compute_polarization_energy(
+PCMSolver_API double pcmsolver_compute_polarization_energy(
     pcmsolver_context_t * context, const char * mep_name, const char * asc_name);
 
 /*! \brief Getter for the ASC dipole
@@ -214,7 +199,7 @@ PCMSOLVER_API double pcmsolver_compute_polarization_energy(
  *  \param[out] dipole  the Cartesian components of the ASC dipole moment
  *  \return the ASC dipole, i.e. \sqrt{\sum_i \mu_i^2}
  */
-PCMSOLVER_API double pcmsolver_get_asc_dipole(pcmsolver_context_t * context,
+PCMSolver_API double pcmsolver_get_asc_dipole(pcmsolver_context_t * context,
                                               const char * asc_name,
                                               double dipole[]);
 
@@ -224,7 +209,7 @@ PCMSOLVER_API double pcmsolver_get_asc_dipole(pcmsolver_context_t * context,
  *  \param[in] values the values wrapped in the surface function
  *  \param[in] name label of the surface function
  */
-PCMSOLVER_API void pcmsolver_get_surface_function(pcmsolver_context_t * context,
+PCMSolver_API void pcmsolver_get_surface_function(pcmsolver_context_t * context,
                                                   int size, double values[],
                                                   const char * name);
 
@@ -234,40 +219,40 @@ PCMSOLVER_API void pcmsolver_get_surface_function(pcmsolver_context_t * context,
  *  \param[in] values the values to be wrapped in the surface function
  *  \param[in] name label of the surface function
  */
-PCMSOLVER_API void pcmsolver_set_surface_function(pcmsolver_context_t * context,
+PCMSolver_API void pcmsolver_set_surface_function(pcmsolver_context_t * context,
                                                   int size, double values[],
                                                   const char * name);
 
 /*! \brief Prints surface function contents to host output
  *  \param[in, out] context the PCM context object
  *  \param[in] name label of the surface function
  */
-PCMSOLVER_API void pcmsolver_print_surface_function(pcmsolver_context_t * context,
+PCMSolver_API void pcmsolver_print_surface_function(pcmsolver_context_t * context,
                                                     const char * name);
 
 /*! \brief Dumps all currently saved surface functions to NumPy arrays in .npy files
  *  \param[in, out] context the PCM context object
  */
-PCMSOLVER_API void pcmsolver_save_surface_functions(pcmsolver_context_t * context);
+PCMSolver_API void pcmsolver_save_surface_functions(pcmsolver_context_t * context);
 
 /*! \brief Dumps a surface function to NumPy array in .npy file
  *  \param[in, out] context the PCM context object
  *  \param[in] name label of the surface function
  */
-PCMSOLVER_API void pcmsolver_save_surface_function(pcmsolver_context_t * context,
+PCMSolver_API void pcmsolver_save_surface_function(pcmsolver_context_t * context,
                                                    const char * name);
 
 /*! \brief Loads a surface function from a .npy file
  *  \param[in, out] context the PCM context object
  *  \param[in] name label of the surface function
  */
-PCMSOLVER_API void pcmsolver_load_surface_function(pcmsolver_context_t * context,
+PCMSolver_API void pcmsolver_load_surface_function(pcmsolver_context_t * context,
                                                    const char * name);
 
 /*! \brief Writes timing results for the API
  *  \param[in, out] context the PCM context object
  */
-PCMSOLVER_API void pcmsolver_write_timings(pcmsolver_context_t * context);
+PCMSolver_API void pcmsolver_write_timings(pcmsolver_context_t * context);
 
 #ifdef __cplusplus
 }

cmake/autocmake.cfg

@@ -29,6 +29,7 @@ modules:
       - '%(url_root)modules/safeguards.cmake'
       - '%(url_root)modules/python_interpreter.cmake'
       - 'custom/pcmsolver.cmake'
+      - 'custom/api.cmake'
       - '%(url_root)modules/git_info/git_info.cmake'
   - boost:
     - major: 1
@@ -46,7 +47,6 @@ modules:
       - 'custom/autogenerated.cmake'
       - 'custom/documentation.cmake'
       - 'custom/export.cmake'
-      - 'custom/api.cmake'
   - src:
     - source: '%(url_root)modules/src.cmake'
   - custom:

cmake/autocmake.yml

@@ -12,13 +12,7 @@
 #   docopt: "--fbindings=<ENABLE_FORTRAN_API> Enable compilation of Fortran 90 API bindings <ON/OFF> [default: ON]."
 #   define: "'-DENABLE_FORTRAN_API={0}'.format(arguments['--fbindings'])"
 
-include_directories(${PROJECT_SOURCE_DIR}/api)
-
-install(FILES ${PROJECT_SOURCE_DIR}/api/pcmsolver.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
-install(FILES ${PROJECT_SOURCE_DIR}/api/PCMInput.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
+option(ENABLE_FORTRAN_API "Enable compilation of Fortran 90 API bindings" ON)
 
-if(ENABLE_FORTRAN_API)
-    add_definitions(-DENABLE_FORTRAN_API)
-    add_library(fortran_bindings OBJECT ${PROJECT_SOURCE_DIR}/api/pcmsolver.f90)
-    list(APPEND _objects $<TARGET_OBJECTS:fortran_bindings>)
-endif()
+add_subdirectory(api)
+include_directories(${PROJECT_SOURCE_DIR}/api)

cmake/custom/api.cmake

@@ -1,5 +1,8 @@
 option(ENABLE_CXX11_SUPPORT "Enable C++11 compiler support" ON)
 
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+
 include(GNU.CXX)
 include(Clang.CXX)
 include(Intel.CXX)

cmake/custom/compilers/CXXFlags.cmake

@@ -1,7 +1,6 @@
 option(ENABLE_LOGGER "Enable logger" OFF)
 option(ENABLE_TIMER "Enable timer" ON)
 option(BUILD_STANDALONE "Enable build of standalone executables" ON)
-option(ENABLE_FORTRAN_API "Builds optional Fortran90 API" OFF)
 
 # Add definitions
 if(ENABLE_TIMER)