Mercurial Mercurial > Dionysus / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleaned up CMake files to play nice with CGAL dev
authorDmitriy Morozov <dmitriy@mrzv.org>
Fri, 03 Dec 2010 11:26:12 -0800
branchdev
changeset 237 92b59e2e6fb3
parent 236 e90653a59fa6
child 238 79bf90c0200d
Cleaned up CMake files to play nice with CGAL
bindings/python/CMakeLists.txt file | annotate | diff | comparison | revisions
examples/alphashapes/CMakeLists.txt file | annotate | diff | comparison | revisions
examples/ar-vineyard/CMakeLists.txt file | annotate | diff | comparison | revisions
examples/pl-functions/CMakeLists.txt file | annotate | diff | comparison | revisions 
--- a/bindings/python/CMakeLists.txt	Sat Oct 09 13:56:26 2010 -0700
+++ b/bindings/python/CMakeLists.txt	Fri Dec 03 11:26:12 2010 -0800
@@ -28,7 +28,7 @@
     add_definitions         (${CGAL_CXX_FLAGS_INIT})
     include_directories     (${CGAL_INCLUDE_DIRS})
 
-    link_libraries          (${CGAL_LIBRARY})                                            
+    link_libraries          (${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES})
 else                            (CGAL_FOUND)
     message(STATUS "CGAL not found, alphashape bindings will not be built")
     add_definitions         (-DNO_CGAL)
--- a/examples/alphashapes/CMakeLists.txt	Sat Oct 09 13:56:26 2010 -0700
+++ b/examples/alphashapes/CMakeLists.txt	Fri Dec 03 11:26:12 2010 -0800
@@ -18,7 +18,7 @@
 
     foreach                     (t ${targets})
         add_executable          (${t} ${t}.cpp)
-        target_link_libraries   (${t} ${libraries} ${CGAL_LIBRARY})
+        target_link_libraries   (${t} ${libraries} ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES})
     endforeach                  (t ${targets})
 else                            (CGAL_FOUND)
     message(STATUS "CGAL not found, therefore alphashapes will not be built.")
--- a/examples/ar-vineyard/CMakeLists.txt	Sat Oct 09 13:56:26 2010 -0700
+++ b/examples/ar-vineyard/CMakeLists.txt	Fri Dec 03 11:26:12 2010 -0800
@@ -4,7 +4,7 @@
 add_definitions				(${cgal_cxxflags})
 foreach 					(t ${targets})
 	add_executable			(${t} ${t}.cpp ${external_sources})
-	target_link_libraries	(${t}   ${libraries} ${cgal_libraries} 
+	target_link_libraries	(${t}   ${libraries} ${cgal_library} ${CGAL_3RD_PARTY_LIBRARIES} 
                                     ${Boost_SIGNALS_LIBRARY} 
                                     ${Boost_PROGRAM_OPTIONS_LIBRARY})
 endforeach 					(t)
--- a/examples/pl-functions/CMakeLists.txt	Sat Oct 09 13:56:26 2010 -0700
+++ b/examples/pl-functions/CMakeLists.txt	Fri Dec 03 11:26:12 2010 -0800
@@ -1,24 +1,16 @@
 set							(targets						
 							 test-grid2D 
 							 test-grid2D-vineyard
-							 combustion-vineyard)
+							 combustion-vineyard
+                             pl-vineyard)
 
 if                          (use_dsrpdb)
-    set                     (targets                    ${targets}
-                            							pdbdistance-vineyard)
+    set                     (t                          pdbdistance-vineyard)
+    add_executable			(${t} ${t}.cpp)
+    target_link_libraries	(${t} ${libraries} ${dsrpdb_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
 endif                       (use_dsrpdb)
 
-if                              (CGAL_FOUND)
-    # add_definitions             (${CGAL_CXX_FLAGS_INIT})
-    add_definitions             (-frounding-math)
-    include_directories         (${CGAL_INCLUDE_DIRS})
-
-    foreach 					(t ${targets})
-        add_executable			(${t} ${t}.cpp)
-        target_link_libraries	(${t} ${libraries} ${CGAL_LIBRARY} ${dsrpdb_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
-    endforeach 					(t ${targets})
-    
-    # Extra special for program_options
-    add_executable			(pl-vineyard pl-vineyard.cpp)
-    target_link_libraries   (pl-vineyard ${libraries} ${CGAL_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
-endif                           (CGAL_FOUND)
+foreach 					(t ${targets})
+    add_executable			(${t} ${t}.cpp)
+    target_link_libraries	(${t} ${libraries} ${Boost_PROGRAM_OPTIONS_LIBRARY})
+endforeach 					(t ${targets})
Dionysus