run workflow without cmaes

phbasler · Aug 11, 2024 · aa031ab · aa031ab
1 parent c38bf0c
commit aa031ab
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/conan.yml b/.github/workflows/conan.yml
@@ -35,4 +35,8 @@ jobs:
               architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
           - name: Install conan
             run: pip install conan>2
+
+          - name: Build without cmaes
+            run: python3 Setup.py --create --build-missing --options UseLibCMAES=False
+
           - run: python3 Setup.py --create --build-missing
diff --git a/Setup.py b/Setup.py
@@ -165,8 +165,6 @@ def conan_install(
 
     if build_missing:
         cmd += ["--build=missing"]
-    else:
-        cmd += ["--build=cmaes/0.10.0"]
 
     print(f"Executing command {cmd}")
 

diff --git a/src/minimizer/CMakeLists.txt b/src/minimizer/CMakeLists.txt
@@ -18,7 +18,7 @@ target_sources(
 
 if(cmaes_FOUND)
   add_subdirectory(LibCMAES)
-  target_link_libraries(Minimizer PUBLIC Minimizer_CMAES)
+  target_link_libraries(Minimizer PRIVATE Minimizer_CMAES)
 endif()
 
 if(NLopt_FOUND)

diff --git a/tools/cmake/CMAES.cmake b/tools/cmake/CMAES.cmake
@@ -15,6 +15,7 @@ if(NOT libcmaes_FOUND)
     option(LIBCMAES_BUILD_PYTHON OFF)
     option(LIBCMAES_BUILD_EXAMPLES OFF)
     option(LIBCMAES_USE_OPENMP OpenMP_FOUND)
+    option(LIBCMAES_BUILD_SHARED_LIBS OFF)
     FetchContent_Populate(libcmaes)
     add_subdirectory(${libcmaes_SOURCE_DIR} ${libcmaes_BINARY_DIR})
     include(GenerateExportHeader)