Skip to content

Commit

Permalink
fixed broken commit
Browse files Browse the repository at this point in the history
  • Loading branch information
jaeandersson committed Dec 10, 2010
1 parent e676256 commit 26a2644
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
7 changes: 5 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
cmake_minimum_required(VERSION 2.0)
project(opticon C CXX)
project(opticon C CXX Fortran)

# Options:
option(WITH_SUPERLU "Compile the SuperLU interface and source" OFF)
option(WITH_SUPERLU "Compile the SuperLU interface and source" ON)
option(WITH_MUSCOD "Compile the MUSCOD-II interface" OFF)
# option(WITH_IPOPT "Compile the Ipopt interface" ON)
# option(WITH_ACADO "Compile the ACADO interface" ON)
# option(WITH_SUNDIALS "Compile the Sundials interface" ON)

#cmake_policy(SET CMP0003 NEW)

Expand Down
4 changes: 2 additions & 2 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ target_link_libraries(rocket_ipopt_sundials sundials_interface ipopt_interface c
ENDIF(SUNDIALS_FOUND AND IPOPT_FOUND)

# SuperLU via CasADi
if(NOT WITHOUT_SUPERLU)
if(WITH_SUPERLU)
IF(BLAS_FOUND)
add_executable(test_superlu_casadi test_superlu_casadi.cpp)
target_link_libraries(test_superlu_casadi superlu_interface casadi superlu ${BLAS_LIBRARIES})
ENDIF(BLAS_FOUND)
endif(NOT WITHOUT_SUPERLU)
endif(WITH_SUPERLU)

# Det minor from ADOL-C
add_executable(det_minor det_minor.cpp)
Expand Down
7 changes: 7 additions & 0 deletions interfaces/muscod/muscod_aux.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#include "muscod_aux.hpp"

using namespace CasADi;

//ResEntry r = {ResEntry::DOUBLE,true,0};


0 comments on commit 26a2644

Please sign in to comment.