casa-mp-base

From eaca63aea72ed4db055514dfec2abc71a106aa70 Mon Sep 17 00:00:00 2001

From: Nigel Stewart <nigels@users.sourceforge.net>

Date: Sun, 13 Nov 2016 16:04:00 +1000

Subject: [PATCH] Mac OSX needs to link OpenGL framework for libglui.dylib

​

---

 CMakeLists.txt | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

​

diff --git a/CMakeLists.txt b/CMakeLists.txt

index 033cfd6..3b3aa2b 100644

--- CMakeLists.txt

+++ CMakeLists.txt

@@ -49,7 +49,7 @@ add_library(glui_obj OBJECT ${GLUI_SRCS})

 set_property(TARGET glui_obj PROPERTY POSITION_INDEPENDENT_CODE 1)

 add_library(glui SHARED $<TARGET_OBJECTS:glui_obj>)

-target_link_libraries(glui ${GLUT_LIBRARIES})

+target_link_libraries(glui ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES})

 add_library(glui_static STATIC $<TARGET_OBJECTS:glui_obj>)

 target_link_libraries(glui_static ${GLUT_LIBRARIES})

From 4299e8fa43bb1e67370be36cad4b21115ab88af9 Mon Sep 17 00:00:00 2001

From: Simone Gasparini <simone.gasparini@gmail.com>

Date: Sun, 14 May 2017 21:44:52 +0200

Subject: [PATCH] [cmake] added install targets

​

---

 CMakeLists.txt        | 96 +++++++++++++++++++++++++++++++++++++++----

 cmake/Config.cmake.in |  4 ++

 2 files changed, 93 insertions(+), 7 deletions(-)

 create mode 100644 cmake/Config.cmake.in

​

diff --git a/CMakeLists.txt b/CMakeLists.txt

index 3b3aa2b..a73e83a 100644

--- CMakeLists.txt

+++ CMakeLists.txt

@@ -1,13 +1,11 @@

-cmake_minimum_required(VERSION 2.8)

+cmake_minimum_required(VERSION 2.8.12)

 project(glui)

+set(PROJECT_VERSION 2.37)

 find_package(GLUT REQUIRED)

 find_package(OpenGL REQUIRED)

-include_directories(${GLUT_INCLUDE_DIR}/include)

-include_directories(${CMAKE_SOURCE_DIR}/include)

-

 SET(GLUI_SRCS

  algebra3.cpp

  arcball.cpp

@@ -44,15 +42,37 @@ SET(GLUI_SRCS

  viewmodel.cpp

 )

 add_library(glui_obj OBJECT ${GLUI_SRCS})

+target_include_directories(glui_obj

+      PUBLIC

+      "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>"

+      ${OPENGL_INCLUDE_DIR}

+      ${GLUT_INCLUDE_DIR})

 # we need to enable -fPIC this so that the same object code can be used to