From 0f2775f761bda512615727c2494b1caabe661326 Mon Sep 17 00:00:00 2001
From: Wolfgang Merkt <w.merkt@gmail.com>
Date: Tue, 24 Aug 2021 19:36:52 +0100
Subject: [PATCH] Move block to set OPTIONS before including base.cmake
Setting INSTALL_DOCUMENTATION OFF wasn't respected as it was overridden
in post-project.cmake which gets called upon setting PROJECT(). Moving
the settings prior to the include of base.cmake, it works as intended.
---
CMakeLists.txt | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97b46d6..bab48e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,20 @@ ENDIF()
SET(CXX_DISABLE_WERROR True)
SET(CMAKE_VERBOSE_MAKEFILE True)
+# ----------------------------------------------------
+# --- OPTIONS ---------------------------------------
+# Need to be set before including base.cmake
+# ----------------------------------------------------
+OPTION(INSTALL_DOCUMENTATION "Generate and install the documentation" OFF)
+OPTION(SUFFIX_SO_VERSION "Suffix library name with its version" OFF)
+
+IF(DEFINED BUILD_UNIT_TESTS)
+ MESSAGE(AUTHOR_WARNING "BUILD_UNIT_TESTS is deprecated. Use BUILD_TESTING instead.\
+ If you are manually building EigenPy from source in an existing build folder,\
+ we suggest that you delete your build folder and make a new one.")
+ SET(BUILD_TESTING ${BUILD_UNIT_TESTS})
+ENDIF(DEFINED BUILD_UNIT_TESTS)
+
INCLUDE(cmake/base.cmake)
COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
@@ -41,19 +55,6 @@ ELSE(WIN32)
SET(LINK create_symlink)
ENDIF(WIN32)
-# ----------------------------------------------------
-# --- OPTIONS ---------------------------------------
-# ----------------------------------------------------
-OPTION(INSTALL_DOCUMENTATION "Generate and install the documentation" FALSE)
-OPTION(SUFFIX_SO_VERSION "Suffix library name with its version" OFF)
-
-IF(DEFINED BUILD_UNIT_TESTS)
- MESSAGE(AUTHOR_WARNING "BUILD_UNIT_TESTS is deprecated. Use BUILD_TESTING instead.\
- If you are manually building Pinocchio from source in an existing build folder,\
- we suggest that you delete your build folder and make a new one.")
- SET(BUILD_TESTING ${BUILD_UNIT_TESTS})
-ENDIF(DEFINED BUILD_UNIT_TESTS)
-
FINDPYTHON()
FIND_NUMPY()
--
GitLab