diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-03-16 20:56:01 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-03-16 20:56:01 (GMT) |
| commit | c855e4d0436a01792b540c7857e1a1997f4810d7 (patch) | |
| tree | 4af96b1e682ed36543986d844d0430abedc10365 /tests/CMakeLists.txt | |
| parent | 5edc8c57da6eb8bfb7725ac51c4b87edd950e847 (diff) | |
| parent | 5628a18f6a0fcf2dd170cac31e386f1ad4f97c0c (diff) | |
Merge branch 'noqt' of ssh://ssh.github.com:443/openscad/openscad into noqt_tweaks
Diffstat (limited to 'tests/CMakeLists.txt')
| -rw-r--r-- | tests/CMakeLists.txt | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 6178c3a..fff537a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -179,28 +179,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") FIND_LIBRARY(COCOA_LIBRARY Cocoa REQUIRED) endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -# Qt4 - -set(CMAKE_INCLUDE_DIRECTORIES_BEFORE ON) -find_package(OpenGL REQUIRED) -if ( "${OPENGL_glu_LIBRARY}" MATCHES "NOTFOUND" ) - # GLU and Mesa split in late 2012 so some systems dont have GLU - find_library(OPENGL_glu_LIBRARY GLU HINTS "$ENV{OPENSCAD_LIBRARIES}/lib" REQUIRED) - set( OPENGL_LIBRARY ${OPENGL_glu_LIBRARY} ${OPENGL_LIBRARY} ) -endif() - -if (MINGW_CROSS_ENV_DIR) - mingw_cross_env_find_qt() - mingw_cross_env_info() - include_directories( ${QT_INCLUDE_DIRS} ) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QT_CFLAGS_OTHER}") -else() - find_package(Qt4 COMPONENTS QtCore REQUIRED) - include(${QT_USE_FILE}) -endif() - -set(CMAKE_INCLUDE_DIRECTORIES_BEFORE OFF) - # Eigen @@ -268,6 +246,8 @@ else() inclusion(EIGEN_DIR EIGEN_INCLUDE_DIR) endif() +# OpenGL +find_package(OpenGL REQUIRED) # OpenCSG if (NOT $ENV{OPENCSGDIR} STREQUAL "") @@ -444,6 +424,7 @@ set(CORE_SOURCES ../src/rotateextrude.cc ../src/printutils.cc ../src/progress.cc + ../src/boost-utils.cc ${FLEX_OpenSCADlexer_OUTPUTS} ${BISON_OpenSCADparser_OUTPUTS}) |