Changeset 13779


Ignore:
Timestamp:
Oct 17, 2019 2:14:57 PM (5 weeks ago)
Author:
randersson
Message:

#5819 Testing setting WITH_OPENMP to OFF

Location:
branches/dev-5819/ThirdParty/CasADi
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-5819/ThirdParty/CasADi/Makefile.am

    r13778 r13779  
    2525    case $(build) in \
    2626    *-cygwin*) \
    27     PKG_CONFIG_PATH=$(IPOPT_HOME)/lib/pkgconfig cmake -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_C_COMPILER_ARG1="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_C_FLAGS="${CMAKE_CASADI_COMPILER_ARGS}" -DCMAKE_CXX_FLAGS="${CMAKE_CASADI_COMPILER_ARGS}" -DCMAKE_SHARED_LINKER_FLAGS="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_CASADI_CXX_FLAG}" -DWITH_PYTHON=ON -DWITH_OPENMP=ON -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -DPYTHON_PREFIX=$(CASADI_PYTHON_INST_DIR) -DPython_ADDITIONAL_VERSIONS="3.7;2.7;2.6;2.5;2.4" -DCMAKE_INSTALL_PREFIX=$(CASADI_INST_DIR) -DPLUGIN_INSTALL_PATH=$(CASADI_PLUGIN_INST_DIR) "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" $(CASADI_SRC_DIR) ;; \
     27    PKG_CONFIG_PATH=$(IPOPT_HOME)/lib/pkgconfig cmake -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_C_COMPILER_ARG1="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_C_FLAGS="${CMAKE_CASADI_COMPILER_ARGS}" -DCMAKE_CXX_FLAGS="${CMAKE_CASADI_COMPILER_ARGS}" -DCMAKE_SHARED_LINKER_FLAGS="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_CASADI_CXX_FLAG}" -DWITH_PYTHON=ON -DWITH_OPENMP=OFF -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -DPYTHON_PREFIX=$(CASADI_PYTHON_INST_DIR) -DPython_ADDITIONAL_VERSIONS="3.7;2.7;2.6;2.5;2.4" -DCMAKE_INSTALL_PREFIX=$(CASADI_INST_DIR) -DPLUGIN_INSTALL_PATH=$(CASADI_PLUGIN_INST_DIR) "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" $(CASADI_SRC_DIR) ;; \
    2828    *-mingw*) \
    29     PKG_CONFIG_PATH=$(IPOPT_HOME)/lib/pkgconfig cmake -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_C_COMPILER_ARG1="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_C_FLAGS="${CMAKE_CASADI_COMPILER_ARGS}" -DCMAKE_CXX_FLAGS="${CMAKE_CASADI_COMPILER_ARGS}" -DCMAKE_SHARED_LINKER_FLAGS="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_CASADI_CXX_FLAG}" -DWITH_PYTHON=ON -DWITH_OPENMP=ON -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -DPYTHON_PREFIX=$(CASADI_PYTHON_INST_DIR) -DPython_ADDITIONAL_VERSIONS="3.7;2.7;2.6;2.5;2.4" -DCMAKE_INSTALL_PREFIX=$(CASADI_INST_DIR) -DPLUGIN_INSTALL_PATH=$(CASADI_PLUGIN_INST_DIR) "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" $(CASADI_SRC_DIR) ;; \
     29    PKG_CONFIG_PATH=$(IPOPT_HOME)/lib/pkgconfig cmake -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_C_COMPILER_ARG1="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_C_FLAGS="${CMAKE_CASADI_COMPILER_ARGS}" -DCMAKE_CXX_FLAGS="${CMAKE_CASADI_COMPILER_ARGS}" -DCMAKE_SHARED_LINKER_FLAGS="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_CASADI_CXX_FLAG}" -DWITH_PYTHON=ON -DWITH_OPENMP=OFF -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -DPYTHON_PREFIX=$(CASADI_PYTHON_INST_DIR) -DPython_ADDITIONAL_VERSIONS="3.7;2.7;2.6;2.5;2.4" -DCMAKE_INSTALL_PREFIX=$(CASADI_INST_DIR) -DPLUGIN_INSTALL_PATH=$(CASADI_PLUGIN_INST_DIR) "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" $(CASADI_SRC_DIR) ;; \
    3030    *-apple*) \
    31     PKG_CONFIG_PATH=$(IPOPT_HOME)/lib/pkgconfig cmake -DWITH_PYTHON=ON -DWITH_OPENMP=ON -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -DPYTHON_PREFIX=$(CASADI_PYTHON_INST_DIR) -DPython_ADDITIONAL_VERSIONS="3.7;2.7;2.6;2.5;2.4" -DCMAKE_INSTALL_PREFIX=$(CASADI_INST_DIR) -DPLUGIN_INSTALL_PATH=$(CASADI_PLUGIN_INST_DIR) "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" $(CASADI_SRC_DIR) ;; \
     31    PKG_CONFIG_PATH=$(IPOPT_HOME)/lib/pkgconfig cmake -DWITH_PYTHON=ON -DWITH_OPENMP=OFF -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -DPYTHON_PREFIX=$(CASADI_PYTHON_INST_DIR) -DPython_ADDITIONAL_VERSIONS="3.7;2.7;2.6;2.5;2.4" -DCMAKE_INSTALL_PREFIX=$(CASADI_INST_DIR) -DPLUGIN_INSTALL_PATH=$(CASADI_PLUGIN_INST_DIR) "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" $(CASADI_SRC_DIR) ;; \
    3232    *) \
    33     PKG_CONFIG_PATH=$(IPOPT_HOME)/lib/pkgconfig cmake -DWITH_PYTHON=ON -DWITH_OPENMP=ON -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -DPYTHON_PREFIX=$(CASADI_PYTHON_INST_DIR) -DPython_ADDITIONAL_VERSIONS="3.7;2.7;2.6;2.5;2.4" -DCMAKE_INSTALL_PREFIX=$(CASADI_INST_DIR) -DPLUGIN_INSTALL_PATH=$(CASADI_PLUGIN_INST_DIR) "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" $(CASADI_SRC_DIR) ;; \
     33    PKG_CONFIG_PATH=$(IPOPT_HOME)/lib/pkgconfig cmake -DWITH_PYTHON=ON -DWITH_OPENMP=OFF -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -DPYTHON_PREFIX=$(CASADI_PYTHON_INST_DIR) -DPython_ADDITIONAL_VERSIONS="3.7;2.7;2.6;2.5;2.4" -DCMAKE_INSTALL_PREFIX=$(CASADI_INST_DIR) -DPLUGIN_INSTALL_PATH=$(CASADI_PLUGIN_INST_DIR) "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" $(CASADI_SRC_DIR) ;; \
    3434    esac
    3535
  • branches/dev-5819/ThirdParty/CasADi/Makefile.in

    r13778 r13779  
    422422    case $(build) in \
    423423    *-cygwin*) \
    424     PKG_CONFIG_PATH=$(IPOPT_HOME)/lib/pkgconfig cmake -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_C_COMPILER_ARG1="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_C_FLAGS="${CMAKE_CASADI_COMPILER_ARGS}" -DCMAKE_CXX_FLAGS="${CMAKE_CASADI_COMPILER_ARGS}" -DCMAKE_SHARED_LINKER_FLAGS="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_CASADI_CXX_FLAG}" -DWITH_PYTHON=ON -DWITH_OPENMP=ON -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -DPYTHON_PREFIX=$(CASADI_PYTHON_INST_DIR) -DPython_ADDITIONAL_VERSIONS="3.7;2.7;2.6;2.5;2.4" -DCMAKE_INSTALL_PREFIX=$(CASADI_INST_DIR) -DPLUGIN_INSTALL_PATH=$(CASADI_PLUGIN_INST_DIR) "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" $(CASADI_SRC_DIR) ;; \
     424    PKG_CONFIG_PATH=$(IPOPT_HOME)/lib/pkgconfig cmake -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_C_COMPILER_ARG1="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_C_FLAGS="${CMAKE_CASADI_COMPILER_ARGS}" -DCMAKE_CXX_FLAGS="${CMAKE_CASADI_COMPILER_ARGS}" -DCMAKE_SHARED_LINKER_FLAGS="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_CASADI_CXX_FLAG}" -DWITH_PYTHON=ON -DWITH_OPENMP=OFF -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -DPYTHON_PREFIX=$(CASADI_PYTHON_INST_DIR) -DPython_ADDITIONAL_VERSIONS="3.7;2.7;2.6;2.5;2.4" -DCMAKE_INSTALL_PREFIX=$(CASADI_INST_DIR) -DPLUGIN_INSTALL_PATH=$(CASADI_PLUGIN_INST_DIR) "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" $(CASADI_SRC_DIR) ;; \
    425425    *-mingw*) \
    426     PKG_CONFIG_PATH=$(IPOPT_HOME)/lib/pkgconfig cmake -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_C_COMPILER_ARG1="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_C_FLAGS="${CMAKE_CASADI_COMPILER_ARGS}" -DCMAKE_CXX_FLAGS="${CMAKE_CASADI_COMPILER_ARGS}" -DCMAKE_SHARED_LINKER_FLAGS="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_CASADI_CXX_FLAG}" -DWITH_PYTHON=ON -DWITH_OPENMP=ON -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -DPYTHON_PREFIX=$(CASADI_PYTHON_INST_DIR) -DPython_ADDITIONAL_VERSIONS="3.7;2.7;2.6;2.5;2.4" -DCMAKE_INSTALL_PREFIX=$(CASADI_INST_DIR) -DPLUGIN_INSTALL_PATH=$(CASADI_PLUGIN_INST_DIR) "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" $(CASADI_SRC_DIR) ;; \
     426    PKG_CONFIG_PATH=$(IPOPT_HOME)/lib/pkgconfig cmake -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_C_COMPILER_ARG1="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_C_FLAGS="${CMAKE_CASADI_COMPILER_ARGS}" -DCMAKE_CXX_FLAGS="${CMAKE_CASADI_COMPILER_ARGS}" -DCMAKE_SHARED_LINKER_FLAGS="${CMAKE_CASADI_CXX_FLAG}" -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_CASADI_CXX_FLAG}" -DWITH_PYTHON=ON -DWITH_OPENMP=OFF -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -DPYTHON_PREFIX=$(CASADI_PYTHON_INST_DIR) -DPython_ADDITIONAL_VERSIONS="3.7;2.7;2.6;2.5;2.4" -DCMAKE_INSTALL_PREFIX=$(CASADI_INST_DIR) -DPLUGIN_INSTALL_PATH=$(CASADI_PLUGIN_INST_DIR) "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" $(CASADI_SRC_DIR) ;; \
    427427    *-apple*) \
    428     PKG_CONFIG_PATH=$(IPOPT_HOME)/lib/pkgconfig cmake -DWITH_PYTHON=ON -DWITH_OPENMP=ON -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -DPYTHON_PREFIX=$(CASADI_PYTHON_INST_DIR) -DPython_ADDITIONAL_VERSIONS="3.7;2.7;2.6;2.5;2.4" -DCMAKE_INSTALL_PREFIX=$(CASADI_INST_DIR) -DPLUGIN_INSTALL_PATH=$(CASADI_PLUGIN_INST_DIR) "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" $(CASADI_SRC_DIR) ;; \
     428    PKG_CONFIG_PATH=$(IPOPT_HOME)/lib/pkgconfig cmake -DWITH_PYTHON=ON -DWITH_OPENMP=OFF -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -DPYTHON_PREFIX=$(CASADI_PYTHON_INST_DIR) -DPython_ADDITIONAL_VERSIONS="3.7;2.7;2.6;2.5;2.4" -DCMAKE_INSTALL_PREFIX=$(CASADI_INST_DIR) -DPLUGIN_INSTALL_PATH=$(CASADI_PLUGIN_INST_DIR) "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" $(CASADI_SRC_DIR) ;; \
    429429    *) \
    430     PKG_CONFIG_PATH=$(IPOPT_HOME)/lib/pkgconfig cmake -DWITH_PYTHON=ON -DWITH_OPENMP=ON -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -DPYTHON_PREFIX=$(CASADI_PYTHON_INST_DIR) -DPython_ADDITIONAL_VERSIONS="3.7;2.7;2.6;2.5;2.4" -DCMAKE_INSTALL_PREFIX=$(CASADI_INST_DIR) -DPLUGIN_INSTALL_PATH=$(CASADI_PLUGIN_INST_DIR) "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" $(CASADI_SRC_DIR) ;; \
     430    PKG_CONFIG_PATH=$(IPOPT_HOME)/lib/pkgconfig cmake -DWITH_PYTHON=ON -DWITH_OPENMP=OFF -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -DPYTHON_PREFIX=$(CASADI_PYTHON_INST_DIR) -DPython_ADDITIONAL_VERSIONS="3.7;2.7;2.6;2.5;2.4" -DCMAKE_INSTALL_PREFIX=$(CASADI_INST_DIR) -DPLUGIN_INSTALL_PATH=$(CASADI_PLUGIN_INST_DIR) "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" $(CASADI_SRC_DIR) ;; \
    431431    esac
    432432
Note: See TracChangeset for help on using the changeset viewer.