Moved nlw-related projects to folders in IDEs.

ampl · Feb 21, 2024 · 7ed3226 · 7ed3226
1 parent 1e85e5d
commit 7ed3226
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -512,6 +512,9 @@ if (BUILD_EXAMPLES OR NLW2_LIB)
   # for a calling CMake project
 	set(NLW2_LIB_NAME ${NLW2_LIB_NAME} PARENT_SCOPE)
 	set(NLW2_C_API_LIB_NAME ${NLW2_C_API_LIB_NAME} PARENT_SCOPE)
+  # Add to folders to better organize project in IDEs
+  add_to_folder(${MP_FOLDER_PREFIX}nlw nlw2 nlw2_c_api nl-writer-example-c nl-writer-example-cpp)
+  add_to_folder(${MP_FOLDER_PREFIX}nlw gen_nl_opcodes nlw-ex-easy-api-c nlw-ex-easy-api-cpp nlw-ex-full-api-c nlw-ex-full-api-cpp)
 endif()
 
 

diff --git a/test/end2end/scripts/python/SolverCollection.py b/test/end2end/scripts/python/SolverCollection.py
@@ -34,6 +34,7 @@ def addStdSolvers(solvers: SolverCollection, binPath=""):
     solvers.addSolver(Solver.CPLEXDirectSolver(path.join(binPath,"cplexmp")))  ## Need as long as the target is there
     solvers.addSolver(Solver.BaronSolver(path.join(binPath,"baron")))
     solvers.addSolver(Solver.ConoptSolver(path.join(binPath,"conopt4")))
+    solvers.addSolver(Solver.ConoptSolver(path.join(binPath,"conopt")))
     solvers.addSolver(Solver.COPTSolver(path.join(binPath,"copt")))
     solvers.addSolver(Solver.MindoptSolver(path.join(binPath,"mindoptampl")))
     solvers.addSolver(Solver.HighsSolver(path.join(binPath,"highs")))