Commit 7b6d4fdb authored by Laurent Belcour's avatar Laurent Belcour

[CI] Ensure correct path for NLOPT configuration

parent ea4bc7db
......@@ -81,7 +81,7 @@ build_script:
) else (
mkdir build &
cd build &
cmake .. -DPython_Version="3.6" -DEIGEN3_INCLUDE_DIR="external/build/include/eigen3" -DCeres_DIR="external/build/CMake" -DNLOPT_INCLUDE_DIRS="external/build/include" -DNLOPT_LIBRARIES="external/build/lib/nlopt.lib" -Wdev -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Release -G "NMake Makefiles" &
cmake .. -DPython_Version="3.6" -DEIGEN3_INCLUDE_DIR="external/build/include/eigen3" -DCeres_DIR="external/build/CMake" -DNLOPT_INCLUDE_DIRS="../external/build/include" -DNLOPT_LIBRARIES="../external/build/lib/nlopt.lib" -Wdev -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Release -G "NMake Makefiles" &
nmake /NOLOGO &
cd ..
)
......
......@@ -209,15 +209,15 @@ target_link_libraries(rational_fitter_parallel quadprog)
# TODO: Add check before compiling IPOPT
if (CERES_FOUND)
include_directories( ${CERES_INCLUDE_DIR} )
alta_add_plugin(nonlinear_fitter_ceres nonlinear_fitter_ceres/fitter.cpp)
target_link_libraries(nonlinear_fitter_ceres ${CERES_LIBRARIES})
target_include_directories(nonlinear_fitter_ceres PUBLIC ${CERES_INCLUDE_DIR})
list(APPEND nonlinear_fitters ceres)
endif()
if (NLOPT_FOUND)
include_directories( ${NLOPT_INCLUDE_DIRS} )
alta_add_plugin(nonlinear_fitter_nlopt nonlinear_fitter_nlopt/fitter.cpp)
target_link_libraries(nonlinear_fitter_nlopt ${NLOPT_LIBRARIES})
target_include_directories(nonlinear_fitter_nlopt PUBLIC ${NLOPT_INCLUDE_DIRS})
list(APPEND nonlinear_fitters nlopt)
endif()
#alta_add_plugin(nonlinear_fitter_ipopt nonlinear_fitter_ipopt/fitter.cpp)
......@@ -306,9 +306,9 @@ add_test(NAME "brdf2data_kirby"
"--data-file" "${CMAKE_SOURCE_DIR}/sources/tests/Kirby2.dat"
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/tests")
add_test(NAME "data2stats_kirby"
COMMAND "data2stats" "--input" "Kirby2.dat"
"--ref" "${CMAKE_SOURCE_DIR}/sources/tests/Kirby2.dat"
add_test(NAME "data2stats_pinkfelt"
COMMAND "data2stats" "--input" "${CMAKE_SOURCE_DIR}/data/brdf/pink-felt-1d.alta"
"--ref" "${CMAKE_SOURCE_DIR}/data/brdf/pink-felt-1d.alta"
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/tests")
foreach(fitter IN ITEMS ${nonlinear_fitters})
......
......@@ -64,7 +64,7 @@ Section "ALTA" SecMain
; Python package
SetOutPath $INSTDIR\python
File /nonfatal /r "${ALTADIR}\build\python\alta.dll"
File /nonfatal /r "${ALTADIR}\build\python\alta.pyd"
# Update the ENVIROMNENT
WriteRegStr HKCU "Environment" "ALTA_DIR" '$INSTDIR'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment