From adc28159abd921fc4cbdd942af8c149ba6800f2a Mon Sep 17 00:00:00 2001 From: Alexander Schmidt Date: Wed, 27 Nov 2013 11:42:58 +0100 Subject: [PATCH] Made opengl optional and added find_package for boost. --- CMakeLists.txt | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4506e8d..761a585 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,8 +5,13 @@ project(latlib) #set(CMAKE_EXE_LINKER_FLAGS -pg) #set(CMAKE_SHARED_LINKER_FLAGS -pg) +cmake_minimum_required(VERSION 2.8) + +find_package(Boost 1.49 COMPONENTS iostreams REQUIRED) +include_directories(${Boost_INCLUDE_DIRS}) + add_library(lat_configcache configcache.cpp) -target_link_libraries(lat_configcache boost_iostreams lat_writeout) +target_link_libraries(lat_configcache ${Boost_LIBRARIES} lat_writeout) add_library(lat_hypercache hypercache.cpp) target_link_libraries(lat_hypercache lat_configcache lat_writeout) @@ -19,16 +24,17 @@ add_library(lat_paraq paraq.cpp) add_library(lat_progress progress.cpp) -find_package(OpenGL REQUIRED) -find_package(GLUT REQUIRED) -include_directories( ${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIRS} ../ ) -add_library(lat_culooks culooks.cpp culooks_cube.cpp culooks_drawing.cpp) -target_link_libraries(lat_culooks ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} pthread) +find_package(OpenGL) +find_package(GLUT) +if (OPENGL_FOUND AND GLUT_FOUND) + include_directories( ${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIRS} ../ ) + add_library(lat_culooks culooks.cpp culooks_cube.cpp culooks_drawing.cpp) + target_link_libraries(lat_culooks ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} pthread) + add_executable(culooks_test culooks_test.cpp) + target_link_libraries(culooks_test lat_culooks) +endif () add_executable(neigh_test neigh_test.cpp) target_link_libraries(neigh_test lat_neigh) -add_executable(culooks_test culooks_test.cpp) -target_link_libraries(culooks_test lat_culooks) - add_subdirectory(o815) -- 2.39.5