Merge branch 'master' into conan

CMA-ES · Jun 1, 2024 · b04a492 · b04a492
2 parents 41b1bf8 + 3b17156
commit b04a492
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ Implementation:
 The library makes use of C++ policy design for modularity, performance and putting the maximum burden on the checks at compile time. The implementation closely follows the algorithms described in (2), (6) and few other publications.
 
 ### Authors
-libcmaes is designed and implemented by Emmanuel Benazera with help of Nikolaus Hansen, on behalf of Inria Saclay / Research group TAO and Laboratoir de l'Accélérateur linéaire, research group Appstats.
+libcmaes was designed and implemented by Emmanuel Benazera with help of Nikolaus Hansen and contributors, on behalf of Inria Saclay / Research group TAO and Laboratoire de l'Accélérateur linéaire, research group Appstats.
 
 ### Build
 Below are instruction for Linux systems, for building on Mac OSX, see https://github.com/beniz/libcmaes/wiki/Building-libcmaes-on-Mac-OSX
@@ -64,7 +64,7 @@ For compiling with CMake:
 ```
 mkdir build
 cd build
-cmake .. -DCMAKE_INSTALL_PREFIX=~/.local/
+cmake .. -DCMAKE_INSTALL_PREFIX=~/.local/ -DLIBCMAES_BUILD_TESTS=ON
 make -j2
 make install
 ```

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -78,7 +78,7 @@ set_target_properties (cmaes PROPERTIES SOVERSION 0 VERSION 0.0.0
                                         POSITION_INDEPENDENT_CODE ON)
 
 include (GenerateExportHeader)
-generate_export_header (cmaes EXPORT_FILE_NAME ${CMAKE_BINARY_DIR}/include/libcmaes/cmaes_export.h)
+generate_export_header (cmaes EXPORT_FILE_NAME ${libcmaes_BINARY_DIR}/include/libcmaes/cmaes_export.h)
 
 install (
   TARGETS cmaes
@@ -89,7 +89,7 @@ install (
   INCLUDES DESTINATION ${RELATIVE_INSTALL_INCLUDE_DIR})
 
 
-install (FILES ${LIBCMAES_HEADERS}  ${CMAKE_BINARY_DIR}/include/libcmaes/cmaes_export.h
+install (FILES ${LIBCMAES_HEADERS}  ${libcmaes_BINARY_DIR}/include/libcmaes/cmaes_export.h
          DESTINATION ${RELATIVE_INSTALL_INCLUDE_DIR}/libcmaes)
 
 if (LIBCMAES_ENABLE_SURROG)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,9 +1,9 @@
 find_package(gflags REQUIRED)
 macro (cmaes_add_test name)
-  add_executable (t_${name} ${name}.cc)
-  target_link_libraries (t_${name} cmaes gflags)
+  add_executable (${name} ${name}.cc)
+  target_link_libraries (${name} cmaes gflags)
   if(MSVC)
-    target_compile_definitions(t_${name} PUBLIC _USE_MATH_DEFINES)
+    target_compile_definitions(${name} PUBLIC _USE_MATH_DEFINES)
   endif()
   add_test (NAME ${name} COMMAND t_${name})
   if (WIN32)