Bläddra i källkod

cmake/examples working on alecs mac

Former-commit-id: 132c9cc14a199f42d4f557c73751cc2b65c3255f
Alec Jacobson 11 år sedan
förälder
incheckning
0daa5ce93b
3 ändrade filer med 16 tillägg och 9 borttagningar
  1. 8 8
      tutorial/CMakeLists.shared
  2. 3 1
      tutorial/cmake/FindANTTWEAKBAR.cmake
  3. 5 0
      tutorial/compile_example.sh

+ 8 - 8
tutorial/CMakeLists.shared

@@ -7,9 +7,9 @@ set(CMAKE_COLOR_MAKEFILE ON)
 ## SEPARATE BUILD OPTIONS ##
 ############################
 
+find_package(ANTTWEAKBAR REQUIRED)
 find_package(OpenGL REQUIRED)
 find_package(GLEW REQUIRED)
-find_package(ANTTWEAKBAR REQUIRED)
 find_package(EIGEN REQUIRED)
 find_package(LIBIGL REQUIRED)
 find_package(TINYXML2 REQUIRED)
@@ -19,22 +19,22 @@ if(APPLE)
 	set(CMAKE_CXX_LINK_FLAGS "-framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo")
 endif (APPLE) #APPLE
 
-include_directories(
-	/usr/local/include
-	/opt/local/include
-    ${PROJECT_SOURCE_DIR}
-    ${OPENGL_INCLUDE_DIR}
-)
+include_directories( ${ANT_TWEAK_BAR_INCLUDE_DIR} )
 
 # message(FATAL_ERROR ${ANT_TWEAK_BAR_INCLUDE_DIR})
 
 
 include_directories( ${GLEW_INCLUDE_DIR} )
-include_directories( ${ANT_TWEAK_BAR_INCLUDE_DIR} )
 include_directories( ${EIGEN_INCLUDE_DIR})
 include_directories( ${LIBIGL_INCLUDE_DIR})
 include_directories( ${TINYXML2_INCLUDE_DIR})
 include_directories( ${GLFW_INCLUDE_DIR})
+include_directories(
+	/usr/local/include
+	/opt/local/include
+    ${PROJECT_SOURCE_DIR}
+    ${OPENGL_INCLUDE_DIR}
+)
 
 link_directories(
 	/usr/local/lib

+ 3 - 1
tutorial/cmake/FindANTTWEAKBAR.cmake

@@ -13,7 +13,8 @@ FIND_PATH(ANT_TWEAK_BAR_INCLUDE_DIR AntTweakBar.h
       ${PROJECT_SOURCE_DIR}/../../external/AntTweakBar/include/
       /usr/local/include
       /usr/X11/include
-      /usr/include)
+      /usr/include
+      NO_DEFAULT_PATH)
 
 set(ANT_TWEAK_BAR_INCLUDE_DIR ${ANT_TWEAK_BAR_INCLUDE_DIR} ${ANT_TWEAK_BAR_INCLUDE_DIR}/../src/)
 
@@ -29,6 +30,7 @@ FIND_LIBRARY( ANT_TWEAK_BAR_LIBRARY AntTweakBar
     lib64
     lib
     dylib
+    NO_DEFAULT_PATH
 )
 
 # message(FATAL_ERROR ${ANT_TWEAK_BAR_LIBRARY})

+ 5 - 0
tutorial/compile_example.sh

@@ -1,3 +1,5 @@
+xhtml header:   <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+
 # Introduction
 
 TODO
@@ -22,3 +24,6 @@ Every example can be compiled by using the cmake file provided in its folder.
 On Linux and MacOSX, you can use the provided bash script:
 
     sh ../compile_example.sh
+
+This is an equation
+ $a = bx$