From ed06583ecad27126861122798a661aa6ef464907 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Tue, 13 Dec 2011 01:23:39 +0100 Subject: [PATCH] Use the same env. variables as in openscad.pro. NB\! This may break some build scripts\! --- tests/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 61e0ef0c..d7959512 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -71,8 +71,8 @@ if (NOT $ENV{MACOSX_DEPLOY_DIR} STREQUAL "") set(BOOST_ROOT "$ENV{MACOSX_DEPLOY_DIR}") endif() -if (NOT $ENV{BOOST_DIR} STREQUAL "") - set(BOOST_DIR "$ENV{BOOST_DIR}") +if (NOT $ENV{BOOSTDIR} STREQUAL "") + set(BOOST_DIR "$ENV{BOOSTDIR}") endif() if (NOT ${BOOST_DIR} STREQUAL "") @@ -140,8 +140,8 @@ endif() include_directories(${EIGEN2_INCLUDE_DIR}) # OpenCSG -if (NOT $ENV{OPENCSG_DIR} STREQUAL "") - set(OPENCSG_DIR "$ENV{OPENCSG_DIR}") +if (NOT $ENV{OPENCSGDIR} STREQUAL "") + set(OPENCSG_DIR "$ENV{OPENCSGDIR}") elseif (NOT $ENV{MACOSX_DEPLOY_DIR} STREQUAL "") set(OPENCSG_DIR "$ENV{MACOSX_DEPLOY_DIR}") endif() @@ -164,8 +164,8 @@ include_directories(${OPENCSG_INCLUDE_DIR}) # GLEW -if (NOT $ENV{GLEW_DIR} STREQUAL "") - set(GLEW_DIR "$ENV{GLEW_DIR}") +if (NOT $ENV{GLEWDIR} STREQUAL "") + set(GLEW_DIR "$ENV{GLEWDIR}") elseif (NOT $ENV{MACOSX_DEPLOY_DIR} STREQUAL "") set(GLEW_DIR "$ENV{MACOSX_DEPLOY_DIR}") endif() @@ -197,8 +197,8 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/parser_yacc.c PROPERTIES # CGAL -if (NOT $ENV{CGAL_DIR} STREQUAL "") - set(CGAL_DIR "$ENV{CGAL_DIR}") +if (NOT $ENV{CGALDIR} STREQUAL "") + set(CGAL_DIR "$ENV{CGALDIR}") elseif (NOT $ENV{MACOSX_DEPLOY_DIR} STREQUAL "") set(CGAL_DIR "$ENV{MACOSX_DEPLOY_DIR}/lib/CGAL") set(CMAKE_MODULE_PATH "${CGAL_DIR}")