From 393e0aeed72add45370bc740fb502ce8585e607f Mon Sep 17 00:00:00 2001 From: Erwin Janssen <erwinjanssen@outlook.com> Date: Tue, 24 Jan 2017 12:25:22 +0100 Subject: [PATCH] Decapitalize CMake option variables The options that can be passed to configure the CMake build, are now in lower case, similar to the Autotools build. --- CMakeLists.txt | 14 +++++++------- lib/ortho/CMakeLists.txt | 4 ++-- lib/sfdpgen/CMakeLists.txt | 4 ++-- lib/vpsc/CMakeLists.txt | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index db69a8bde..5c1a76207 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,17 +3,17 @@ project (Graphviz) # Build options # ============= -option(WITH_IPSEPCOLA "IPSEPCOLA features in neato layout engine (disabled by default - C++ portability issues)." OFF ) -option(WITH_ORTHO "ORTHO features in neato layout engine." ON ) -option(WITH_SFDP "sfdp layout engine." ON ) +option(with_ipsepcola "IPSEPCOLA features in neato layout engine (disabled by default - C++ portability issues)." OFF ) +option(with_ortho "ORTHO features in neato layout engine." ON ) +option(with_sfdp "sfdp layout engine." ON ) -if (WITH_ORTHO) +if (with_ortho) add_definitions(-DORTHO) -endif (WITH_ORTHO) +endif (with_ortho) -if (WITH_SFDP) +if (with_sfdp) add_definitions(-DSFDP) -endif (WITH_SFDP) +endif (with_sfdp) # Append local CMake module directory # =================================== diff --git a/lib/ortho/CMakeLists.txt b/lib/ortho/CMakeLists.txt index 2cef8c314..8e9407d6f 100644 --- a/lib/ortho/CMakeLists.txt +++ b/lib/ortho/CMakeLists.txt @@ -1,4 +1,4 @@ -if (WITH_ORTHO) +if (with_ortho) add_definitions(-D_BLD_gvc=1) @@ -34,4 +34,4 @@ add_library(ortho STATIC trapezoid.c ) -endif (WITH_ORTHO) \ No newline at end of file +endif (with_ortho) \ No newline at end of file diff --git a/lib/sfdpgen/CMakeLists.txt b/lib/sfdpgen/CMakeLists.txt index 97b7c19e3..73e6a0ff6 100644 --- a/lib/sfdpgen/CMakeLists.txt +++ b/lib/sfdpgen/CMakeLists.txt @@ -1,4 +1,4 @@ -if (WITH_SFDP) +if (with_sfdp) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} @@ -36,4 +36,4 @@ add_library(sfdpgen STATIC uniform_stress.c ) -endif (WITH_SFDP) \ No newline at end of file +endif (with_sfdp) \ No newline at end of file diff --git a/lib/vpsc/CMakeLists.txt b/lib/vpsc/CMakeLists.txt index 9c23a1e76..fa485888f 100644 --- a/lib/vpsc/CMakeLists.txt +++ b/lib/vpsc/CMakeLists.txt @@ -1,4 +1,4 @@ -if (WITH_IPSEPCOLA) +if (with_ipsepcola) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} @@ -29,4 +29,4 @@ add_library(vpsc STATIC variable.cpp ) -endif (WITH_IPSEPCOLA) \ No newline at end of file +endif (with_ipsepcola) \ No newline at end of file -- 2.40.0