Changeset 51 in pacpusframework

Timestamp:

Jan 9, 2013, 9:33:34 AM (12 years ago)

Author:

Marek Kurdej

Message:

CMake: added solution folders.
Dependencies: changed Boost 1.52 to 1.49.

Location:

trunk

Files:

• DEPENDENCIES.txt (modified) (1 diff)
• cmake/PacpusConfiguration.cmake (modified) (1 diff)
• cmake/PacpusDependencies.cmake (modified) (1 diff)
• cmake/PacpusUtilities.cmake (modified) (1 diff)

trunk/DEPENDENCIES.txt

@@ -12 +12 @@
 ========================================
 Apache log4cxx 0.10.0 (patched for MSVC)
-Boost 1.52 (include-only headers)
+Boost 1.49 (include-only headers)
 Qt 4.8.4 (pass to Qt 5.0.0)
 

trunk/cmake/PacpusConfiguration.cmake

@@ -22 +22 @@
 set(PACPUS_INSTALL_3RD  FALSE CACHE BOOL "Installation of the 3rd party")
 set(PACPUS_BUILD_DOC    FALSE CACHE BOOL "Whether build the documentation - requires Doxygen")
+set(PACPUS_USE_SOLUTION_FOLDERS  FALSE CACHE BOOL "Use solution folders to classify projects, works in MS Visual Studio")
+
+if(PACPUS_USE_SOLUTION_FOLDERS)
+    if(CMAKE_VERSION VERSION_GREATER "2.8.0")
+        set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+    else()
+        message(AUTHOR_WARNING "Folders are only supported with CMake 2.8.0 and newer, and MSVC 2005 and newer except for 2005/2008/2010 Express Edition")
+    endif()
+endif(PACPUS_USE_SOLUTION_FOLDERS)

trunk/cmake/PacpusDependencies.cmake

@@ -25 +25 @@
 # Do not use compiled modules, include-only headers.
 # ========================================
-find_package(Boost 1.52.0 REQUIRED)
+find_package(Boost 1.49.0 REQUIRED)
 list(APPEND PACPUS_DEPENDENCIES_INC ${Boost_INCLUDE_DIRS})
 

trunk/cmake/PacpusUtilities.cmake

@@ -200 +200 @@
 # ========================================
 function(pacpus_folder target folder_name)
-    if(PACPUS_USE_FOLDERS AND MSVC)
+    if(PACPUS_USE_SOLUTION_FOLDERS AND MSVC)
         set_target_properties(${target}
             PROPERTIES FOLDER ${folder_name}