diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-15 04:17:04 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-15 04:17:04 (GMT) |
| commit | 6aa1a6d4c8fab520d2951ccfddb141ea5825acc1 (patch) | |
| tree | 516b7e1b0236f6b6914f32b75fade5e920f6df4e /tests | |
| parent | b74bb392afbeee062b9654dac78950fc85c4c884 (diff) | |
Some more build system cleaning
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d79925a..edd89aa 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -64,8 +64,8 @@ endif() # # Boost -if (NOT $ENV{MACOSX_DEPLOY_DIR} STREQUAL "") - set(BOOST_ROOT "$ENV{MACOSX_DEPLOY_DIR}") +if (NOT $ENV{OPENSCAD_LIBRARIES} STREQUAL "") + set(BOOST_ROOT "$ENV{OPENSCAD_LIBRARIES}") endif() if (NOT $ENV{BOOSTDIR} STREQUAL "") @@ -151,8 +151,8 @@ include_directories(${EIGEN2_INCLUDE_DIR}) # OpenCSG if (NOT $ENV{OPENCSGDIR} STREQUAL "") set(OPENCSG_DIR "$ENV{OPENCSGDIR}") -elseif (NOT $ENV{MACOSX_DEPLOY_DIR} STREQUAL "") - set(OPENCSG_DIR "$ENV{MACOSX_DEPLOY_DIR}") +elseif (NOT $ENV{OPENSCAD_LIBRARIES} STREQUAL "") + set(OPENCSG_DIR "$ENV{OPENSCAD_LIBRARIES}") endif() if (NOT OPENCSG_INCLUDE_DIR) message(STATUS "OPENCSG_DIR: " ${OPENCSG_DIR}) @@ -175,8 +175,8 @@ include_directories(${OPENCSG_INCLUDE_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}") +elseif (NOT $ENV{OPENSCAD_LIBRARIES} STREQUAL "") + set(GLEW_DIR "$ENV{OPENSCAD_LIBRARIES}") endif() find_package(GLEW REQUIRED) @@ -208,8 +208,8 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/parser_yacc.c PROPERTIES 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") +elseif (NOT $ENV{OPENSCAD_LIBRARIES} STREQUAL "") + set(CGAL_DIR "$ENV{OPENSCAD_LIBRARIES}/lib/CGAL") set(CMAKE_MODULE_PATH "${CGAL_DIR}") endif() message(STATUS "CGAL_DIR: " ${CGAL_DIR}) |