From 91090ce34fe51cb89479ea0c4c12128b20d314d8 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Wed, 27 May 2020 17:13:48 +0200 Subject: [PATCH] Fix tab in cmake files --- cmake/cpp.cmake | 8 ++++---- cmake/python.cmake | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cmake/cpp.cmake b/cmake/cpp.cmake index 1b9cf667b3..287670a5e9 100644 --- a/cmake/cpp.cmake +++ b/cmake/cpp.cmake @@ -114,10 +114,10 @@ endif() add_library(${PROJECT_NAME} "") # Xcode fails to build if library doesn't contains at least one source file. if(XCODE) - file(GENERATE - OUTPUT ${PROJECT_BINARY_DIR}/${PROJECT_NAME}/version.cpp - CONTENT "namespace {char* version = \"${PROJECT_VERSION}\";}") - target_sources(${PROJECT_NAME} PRIVATE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}/version.cpp) + file(GENERATE + OUTPUT ${PROJECT_BINARY_DIR}/${PROJECT_NAME}/version.cpp + CONTENT "namespace {char* version = \"${PROJECT_VERSION}\";}") + target_sources(${PROJECT_NAME} PRIVATE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}/version.cpp) endif() list(APPEND OR_TOOLS_COMPILE_DEFINITIONS diff --git a/cmake/python.cmake b/cmake/python.cmake index 391c6d2bad..f56f400727 100644 --- a/cmake/python.cmake +++ b/cmake/python.cmake @@ -96,12 +96,12 @@ file(COPY ortools/sat/python/visualization.py # setup.py.in contains cmake variable e.g. @PROJECT_NAME@ and # generator expression e.g. $ configure_file( - ${PROJECT_SOURCE_DIR}/ortools/python/setup.py.in - ${PROJECT_BINARY_DIR}/python/setup.py.in - @ONLY) + ${PROJECT_SOURCE_DIR}/ortools/python/setup.py.in + ${PROJECT_BINARY_DIR}/python/setup.py.in + @ONLY) file(GENERATE - OUTPUT ${PROJECT_BINARY_DIR}/python/$/setup.py - INPUT ${PROJECT_BINARY_DIR}/python/setup.py.in) + OUTPUT ${PROJECT_BINARY_DIR}/python/$/setup.py + INPUT ${PROJECT_BINARY_DIR}/python/setup.py.in) # Find if python module MODULE_NAME is available, # if not install it to the Python user install directory. @@ -130,7 +130,7 @@ search_python_module(wheel) # Main Target add_custom_target(python_package ALL - COMMAND ${CMAKE_COMMAND} -E copy $/setup.py setup.py + COMMAND ${CMAKE_COMMAND} -E copy $/setup.py setup.py COMMAND ${CMAKE_COMMAND} -E remove_directory dist COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}/.libs #COMMAND ${CMAKE_COMMAND} -E copy $ ${PROJECT_NAME}/.libs @@ -167,7 +167,7 @@ if(BUILD_TESTING) endif() # make a virtualenv to install our python package in it add_custom_command(TARGET python_package POST_BUILD - COMMAND ${VENV_EXECUTABLE} -p ${Python_EXECUTABLE} ${VENV_DIR} + COMMAND ${VENV_EXECUTABLE} -p ${Python_EXECUTABLE} ${VENV_DIR} # Must not call it in a folder containing the setup.py otherwise pip call it # (i.e. "python setup.py bdist") while we want to consume the wheel package COMMAND ${VENV_Python_EXECUTABLE} -m pip install --find-links=${CMAKE_CURRENT_BINARY_DIR}/python/dist ${PROJECT_NAME} @@ -175,8 +175,8 @@ if(BUILD_TESTING) BYPRODUCTS ${VENV_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} VERBATIM) # run the tests within the virtualenv - add_test(NAME pytest_venv - COMMAND ${VENV_Python_EXECUTABLE} ${VENV_DIR}/test.py) + add_test(NAME pytest_venv + COMMAND ${VENV_Python_EXECUTABLE} ${VENV_DIR}/test.py) #add_subdirectory(examples/python) #add_subdirectory(examples/notebook)