Experimental support for statically linked NOMAD

examples/advanced/library/c_api/example1/CMakeLists.txt

@@ -8,9 +8,9 @@ set_target_properties(example1_c_api.exe PROPERTIES INSTALL_RPATH "${CMAKE_INSTA
 
 
 if(OpenMP_CXX_FOUND)
- target_link_libraries(example1_c_api.exe PUBLIC nomadAlgos nomadUtils nomadEval nomadCInterface OpenMP::OpenMP_CXX)
+ target_link_libraries(example1_c_api.exe PUBLIC nomadCInterface OpenMP::OpenMP_CXX)
 else()
- target_link_libraries(example1_c_api.exe PUBLIC nomadAlgos nomadUtils nomadEval nomadCInterface)
+ target_link_libraries(example1_c_api.exe PUBLIC nomadCInterface)
 endif()
 if (WIN32)
 else()

examples/advanced/library/c_api/example2/CMakeLists.txt

@@ -8,9 +8,9 @@ set_target_properties(example2_c_api.exe PROPERTIES INSTALL_RPATH "${CMAKE_INSTA
 
 
 if(OpenMP_CXX_FOUND)
- target_link_libraries(example2_c_api.exe PUBLIC nomadAlgos nomadUtils nomadEval nomadCInterface OpenMP::OpenMP_CXX)
+ target_link_libraries(example2_c_api.exe PUBLIC nomadCInterface OpenMP::OpenMP_CXX)
 else()
- target_link_libraries(example2_c_api.exe PUBLIC nomadAlgos nomadUtils nomadEval nomadCInterface)
+ target_link_libraries(example2_c_api.exe PUBLIC nomadCInterface)
 endif()
 if (WIN32)
 else()

ext/sgtelib/CMakeLists.txt

@@ -103,42 +103,18 @@ set(SGTELIB_MAIN_SOURCE src/sgtelib.cpp)
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 
-# build shared library sgtelib
-add_library (sgtelib SHARED ${SGTELIB_SOURCES})
-target_include_directories(sgtelib PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/sgtelib>
- )
-
-# export symbols on Windows
-if (WIN32)
- target_compile_definitions(sgtelib PRIVATE -DDLL_EXPORTS)
-endif()
-
-#add_executable (sgtelib_main ${SGTELIB_MAIN_SOURCE})
-#set_target_properties(sgtelib_main PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-#target_include_directories(sgtelib_main PUBLIC
-# $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
-# $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/sgtelib>
-#)
-#target_link_libraries(sgtelib_main PUBLIC sgtelib)
-
-set_target_properties(sgtelib PROPERTIES 
- VERSION ${SGTELIB_VERSION}
- SOVERSION ${SGTELIB_VERSION_MAJOR}.${SGTELIB_VERSION_MINOR})
-
-# installing executables and libraries
-install(TARGETS sgtelib 
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sgtelib
- )
-
-# install header files
-install(FILES ${SGTELIB_HEADERS}
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sgtelib
- )
-
-
+# Build shared libraries (sgtelib)
+include(./CMakeListsLibs.txt)
+
+# Build static libraries (sgtelibStatic)
+include(./CMakeListsLibsStatic.txt)
+
+# Install header files
+install(
+ FILES 
+ ${SGTELIB_HEADERS}
+ DESTINATION
+ ${CMAKE_INSTALL_INCLUDEDIR}/sgtelib
+)
 
 

ext/sgtelib/CMakeListsLibs.txt

@@ -0,0 +1,52 @@
+# Build the object first. 
+#
+# It will be built only once, then linked twice to make the shared and the
+# static variant of the library.
+
+add_library(
+ sgtelib
+ SHARED
+ ${SGTELIB_SOURCES}
+)
+
+target_include_directories(
+ sgtelib
+ PUBLIC
+ $<BUILD_INTERFACE: 
+ ${CMAKE_CURRENT_SOURCE_DIR}/src
+ >
+ $<INSTALL_INTERFACE:
+ ${CMAKE_INSTALL_INCLUDEDIR}/sgtelib
+ >
+)
+
+set_target_properties(
+ sgtelib
+ PROPERTIES 
+ VERSION ${SGTELIB_VERSION}
+ SOVERSION ${SGTELIB_VERSION_MAJOR}.${SGTELIB_VERSION_MINOR}
+ OUTPUT_NAME sgtelib
+)
+
+if (WIN32)
+ target_compile_definitions(
+ sgtelib
+ PRIVATE 
+ -DDLL_EXPORTS
+ )
+endif()
+
+# Install both variants of the library.
+#
+
+install(
+ TARGETS 
+ sgtelib
+ RUNTIME DESTINATION 
+ ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION 
+ ${CMAKE_INSTALL_LIBDIR}
+ PUBLIC_HEADER DESTINATION 
+ ${CMAKE_INSTALL_INCLUDEDIR}/sgtelib
+)
+

ext/sgtelib/CMakeListsLibsStatic.txt

@@ -0,0 +1,50 @@
+# Build the object first. 
+#
+# It will be built only once, then linked twice to make the shared and the
+# static variant of the library.
+
+add_library(
+ sgtelibStatic
+ STATIC
+ ${SGTELIB_SOURCES}
+)
+
+target_include_directories(
+ sgtelibStatic
+ PUBLIC
+ $<BUILD_INTERFACE: 
+ ${CMAKE_CURRENT_SOURCE_DIR}/src
+ >
+ $<INSTALL_INTERFACE:
+ ${CMAKE_INSTALL_INCLUDEDIR}/sgtelib
+ >
+)
+
+set_target_properties(
+ sgtelibStatic
+ PROPERTIES 
+ VERSION ${SGTELIB_VERSION}
+ SOVERSION ${SGTELIB_VERSION_MAJOR}.${SGTELIB_VERSION_MINOR}
+ OUTPUT_NAME sgtelibStatic
+)
+
+if (WIN32)
+ target_compile_definitions(
+ sgtelibStatic
+ PRIVATE 
+ -DNOMAD_STATIC_BUILD
+ )
+endif()
+
+# Install both variants of the library.
+#
+
+install(
+ TARGETS 
+ sgtelibStatic
+ RUNTIME DESTINATION 
+ ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION 
+ ${CMAKE_INSTALL_LIBDIR}
+)
+

ext/sgtelib/src/Defines.hpp

@@ -36,7 +36,7 @@
 #include <limits.h>
 
 // CASE Visual Studio C++ compiler
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(NOMAD_STATIC_BUILD)
 #pragma warning(disable:4251)
 #ifdef DLL_EXPORTS
 #define DLL_API __declspec(dllexport) 

interfaces/CInterface/CMakeLists.txt

@@ -1,45 +1,99 @@
 #
 # Source and header
 #
+
 set(INTERFACE_SOURCES
-  ${CMAKE_CURRENT_SOURCE_DIR}/NomadStdCInterface.cpp)
+ ${CMAKE_CURRENT_SOURCE_DIR}/NomadStdCInterface.cpp)
 
 set(INTERFACE_HEADERS
- ${CMAKE_CURRENT_SOURCE_DIR}/NomadStdCInterface.h)
-
+ ${CMAKE_CURRENT_SOURCE_DIR}/NomadStdCInterface.h)
 
 # 
 # Build 
 #
-add_library (nomadCInterface SHARED ${INTERFACE_SOURCES}) 
-target_include_directories(nomadCInterface PUBLIC
- $<BUILD_INTERFACE: ${CMAKE_BINARY_DIR}/interfaces/CInterface>
- $<INSTALL_INTERFACE: ${CMAKE_INSTALL_INCLUDEDIR}>
+
+if(WIN32)
+ # set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+endif()
+
+add_library(
+ nomadCInterface 
+ SHARED 
+ ${INTERFACE_SOURCES}
+) 
+
+target_include_directories(
+ nomadCInterface 
+ PUBLIC
+ $<BUILD_INTERFACE: 
+ ${CMAKE_BINARY_DIR}/interfaces/CInterface
+ >
+ $<INSTALL_INTERFACE: 
+ ${CMAKE_INSTALL_INCLUDEDIR}
+ >
+)
+
+target_link_libraries(
+ nomadCInterface 
+ PRIVATE
+ nomadStatic 
 )
+
 if (WIN32)
- target_compile_definitions(nomadCInterface PRIVATE -DDLL_ALGO_EXPORTS)
+ target_compile_definitions(
+ nomadCInterface 
+ PRIVATE 
+ -DNOMAD_STATIC_BUILD
+ -DNOMAD_INTERFACE_C_DLL
+ )
 endif()
 
-target_link_libraries(nomadCInterface PUBLIC nomadAlgos nomadUtils nomadEval)
-if(OpenMP_CXX_FOUND)
- target_link_libraries(nomadCInterface PUBLIC OpenMP::OpenMP_CXX)
+if (OpenMP_CXX_FOUND)
+ target_link_libraries(
+ nomadCInterface 
+ PUBLIC 
+ OpenMP::OpenMP_CXX
+ )
 endif()
-if (WIN32)
-else() 
- target_link_libraries(nomadCInterface PRIVATE m)
+
+if(NOT WIN32)
+ target_link_libraries(
+ nomadCInterface 
+ PRIVATE 
+ m
+ )
 endif()
 
-set_target_properties(nomadCInterface PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+set_target_properties(
+ nomadCInterface 
+ PROPERTIES 
+ INSTALL_RPATH 
+ "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}"
+ VERSION 
+ "${NOMAD_VERSION}"
+ SOVERSION 
+ "${NOMAD_VERSION_MAJOR}.${NOMAD_VERSION_MINOR}"
+)
 
 # 
-# Install binary and header
+# Install library and headers
 #
-install(TARGETS nomadCInterface
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/
- )
 
-install(FILES ${INTERFACE_HEADERS}
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interfaces/CInterface
- )
+install(
+ TARGETS 
+ nomadCInterface
+ RUNTIME DESTINATION 
+ ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION 
+ ${CMAKE_INSTALL_LIBDIR}
+ PUBLIC_HEADER DESTINATION 
+ ${CMAKE_INSTALL_INCLUDEDIR}/
+)
+
+install(
+ FILES 
+ ${INTERFACE_HEADERS}
+ DESTINATION 
+ ${CMAKE_INSTALL_INCLUDEDIR}/interfaces/CInterface
+)
+

interfaces/CInterface/NomadStdCInterface.h

@@ -1,6 +1,15 @@
 #ifndef _NOMADSTDCINTERFACE_H_
 #define _NOMADSTDCINTERFACE_H_
 
+#ifdef _MSC_VER
+ #ifdef NOMAD_INTERFACE_C_DLL
+ #define DLL_EXPORT_API __declspec(dllexport)
+ #else
+ #define DLL_EXPORT_API __declspec(dllimport)
+ #endif
+#else
+ #define DLL_EXPORT_API
+#endif
 
 #include "nomad_platform.hpp"
 // strongly inspired by Ipopt C interface
@@ -22,31 +31,31 @@ extern "C"
  // Blackbox functions types
  typedef bool (*Callback_BB_single)(int, double *, int, double *, bool *, NomadUserDataPtr);
 
- DLL_ALGO_API NomadProblem createNomadProblem(
+ DLL_EXPORT_API NomadProblem createNomadProblem(
  Callback_BB_single bb_single, // black box function
  int nb_inputs, // number of inputs
  int nb_outputs // number of outputs
  );
 
- DLL_ALGO_API void freeNomadProblem(NomadProblem nomad_problem);
+ DLL_EXPORT_API void freeNomadProblem(NomadProblem nomad_problem);
 
 
 
  // parameters settings
- DLL_ALGO_API bool addNomadParam(NomadProblem nomad_problem, char *keyword_value_pair);
+ DLL_EXPORT_API bool addNomadParam(NomadProblem nomad_problem, char *keyword_value_pair);
 
- DLL_ALGO_API bool addNomadValParam(NomadProblem nomad_problem, char *keyword, int value);
+ DLL_EXPORT_API bool addNomadValParam(NomadProblem nomad_problem, char *keyword, int value);
 
- DLL_ALGO_API bool addNomadDoubleParam(NomadProblem nomad_problem, char *keyword, double value);
+ DLL_EXPORT_API bool addNomadDoubleParam(NomadProblem nomad_problem, char *keyword, double value);
 
- DLL_ALGO_API bool addNomadBoolParam(NomadProblem nomad_problem, char *keyword, bool value);
+ DLL_EXPORT_API bool addNomadBoolParam(NomadProblem nomad_problem, char *keyword, bool value);
 
- DLL_ALGO_API bool addNomadStringParam(NomadProblem nomad_problem, char *keyword, char *param_str);
+ DLL_EXPORT_API bool addNomadStringParam(NomadProblem nomad_problem, char *keyword, char *param_str);
 
- DLL_ALGO_API bool addNomadArrayOfDoubleParam(NomadProblem nomad_problem, char *keyword, double *array_param);
+ DLL_EXPORT_API bool addNomadArrayOfDoubleParam(NomadProblem nomad_problem, char *keyword, double *array_param);
 
  // For the moment, do not allow the warm start
- DLL_ALGO_API bool solveNomadProblem(NomadProblem nomad_problem,
+ DLL_EXPORT_API bool solveNomadProblem(NomadProblem nomad_problem,
  int nb_starting_points, // number of starting points
  double *x0s, // starting points
  bool *exists_feas_sol, // indicates if the algorithm finds a feasible solution