CMakeLists.txt in scs-0.3.0

- old
+ new

@@ -105,11 +105,12 @@
   src/normalize.c
   src/rw.c
   src/scs.c
   src/scs_version.c
   src/util.c
-  ${LINSYS}/amatrix.c)
+  ${LINSYS}/csparse.c
+  ${LINSYS}/scs_matrix.c)
 
 # Common header files
 set(${PROJECT_NAME}_HDR
   include/aa.h
   include/cones.h
@@ -120,11 +121,12 @@
   include/normalize.h
   include/rw.h
   include/scs.h
   include/scs_blas.h
   include/util.h
-  ${LINSYS}/amatrix.h)
+  ${LINSYS}/csparse.h
+  ${LINSYS}/scs_matrix.h)
 
 # get all the c file in amd/external
 file(GLOB ${PROJECT_NAME}_AMD_EXTERNAL_SRC
   ${EXTERNAL}/amd/*.c
   )
@@ -158,11 +160,11 @@
 target_include_directories(${${PROJECT_NAME}_DIRECT} PUBLIC
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
   "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/scs>")
 
 # Compiled with blas and lapack, can solve LPs, SOCPs, SDPs, ECPs, and PCPs
-target_compile_definitions(${${PROJECT_NAME}_DIRECT} PRIVATE -DUSE_LAPACK)
+target_compile_definitions(${${PROJECT_NAME}_DIRECT} PRIVATE -DUSE_LAPACK -DCOPYAMATRIX -DCTRLC)
 
 # The library depends on math (m) blas and lapack
 target_link_libraries(${${PROJECT_NAME}_DIRECT} PRIVATE
   m
   blas
@@ -192,15 +194,12 @@
 set(${PROJECT_NAME}_INDIRECT ${PROJECT_NAME}indir)
 add_library(${${PROJECT_NAME}_INDIRECT}
   ${${PROJECT_NAME}_HDR}
   ${${PROJECT_NAME}_SRC}
   ${INDIRSRC}/private.c
+  ${INDIRSRC}/private.h
   ${${${PROJECT_NAME}_INDIRECT}_HDR}
-  ${EXTERNAL}/qdldl/qdldl.c
-  ${${PROJECT_NAME}_AMD_EXTERNAL_SRC}
-  ${${PROJECT_NAME}_AMD_EXTERNAL_HDR}
-  ${${PROJECT_NAME}_LDL_EXTERNAL_SRC}
   )
 
 
 target_include_directories(${${PROJECT_NAME}_INDIRECT} PRIVATE
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${EXTERNAL}/amd;${CMAKE_CURRENT_SOURCE_DIR}/${EXTERNAL}/qdldl;${CMAKE_CURRENT_SOURCE_DIR}/${INDIRSRC};${CMAKE_CURRENT_SOURCE_DIR}/${LINSYS}>")
@@ -208,10 +207,10 @@
 target_include_directories(${${PROJECT_NAME}_INDIRECT} PUBLIC
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
   "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/scs>")
 
 # Compiled with blas and lapack, can solve LPs, SOCPs, SDPs, ECPs, and PCPs
-target_compile_definitions(${${PROJECT_NAME}_INDIRECT} PRIVATE -DUSE_LAPACK)
+target_compile_definitions(${${PROJECT_NAME}_INDIRECT} PRIVATE -DUSE_LAPACK -DCOPYAMATRIX -DCTRLC -DINDIRECT)
 
 # The library depends on math (m) blas and lapack
 target_link_libraries(${${PROJECT_NAME}_INDIRECT} PUBLIC
   m
   blas