Changeset 8:dda9b6665fde in lemon-project-template-glpk

Timestamp:

03/22/11 20:26:58 (14 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Improved install locations

Files:

• CMakeLists.txt (modified) (4 diffs)
• doc/CMakeLists.txt (modified) (1 diff)
• src/CMakeLists.txt (modified) (1 diff)

CMakeLists.txt

@@ -17 +17 @@
 
 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+
+IF(UNIX)
+  SET(INSTALL_BIN_DIR "bin" CACHE STRING
+    "Subdir for installing the binaries")
+  SET(INSTALL_DOC_DIR "share/doc/${PROJECT_NAME}"
+    CACHE STRING
+    "Subdir for installing the doc")
+  SET(INSTALL_DATA_DIR "share/data/${PROJECT_NAME}"
+    CACHE STRING
+    "Subdir for installing the map data")
+  SET(INSTALL_EXAMPLES_DIR "share/doc/${PROJECT_NAME}/examples"
+    CACHE STRING
+    "Subdir for installing the examples")
+ELSE(UNIX)
+  SET(INSTALL_BIN_DIR "." CACHE STRING
+                  "Subdir for installing the binaries")
+  SET(INSTALL_DOC_DIR "doc" CACHE STRING
+                  "Subdir for installing the doc")
+  SET(INSTALL_DATA_DIR "data" CACHE STRING
+                  "Subdir for installing the map data")
+  SET(INSTALL_EXAMPLES_DIR "examples" CACHE STRING
+                       "Subdir for installing the examples")
+ENDIF(UNIX)
 
 ## The next part looks for LEMON. Typically, you don't want to modify it.
@@ -62 +85 @@
 )
 
+IF(CMAKE_COMPILER_IS_GNUCXX)
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 ADD_SUBDIRECTORY(src)
 
@@ -105 +132 @@
 ## - CPACK_PACKAGE_ICON
 ## - CPACK_NSIS_INSTALLED_ICON_NAME
-##
+## 
 ## and/or the files they point to.
 #######################################################################
@@ -121 +148 @@
       "${PROJECT_NAME}")
   SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY
-      "${PROJECT_NAME}")
+      "${PROJECT_NAME} ${PROJECT_VERSION}")
 
-  SET(CPACK_COMPONENTS_ALL
-      html_documentation
-      bin)
+  SET(CPACK_COMPONENTS_ALL bin doc)
 
-  SET(CPACK_COMPONENT_BIN_DISPLAY_NAME "Command line utilities")
-  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")
-
+  SET(CPACK_COMPONENT_BIN_DISPLAY_NAME "Executables")
   SET(CPACK_COMPONENT_BIN_DESCRIPTION
       "Command line utilities")
-  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION
-      "Doxygen generated documentation")
+  SET(CPACK_COMPONENT_BIN_REQUIRED TRUE)
 
+  SET(CPACK_COMPONENT_DOC_DISPLAY_NAME "Documentation")
+  SET(CPACK_COMPONENT_DOC_DESCRIPTION
+      "Documentation generated by Doxygen.")
+
+    
   SET(CPACK_GENERATOR "NSIS")
 

doc/CMakeLists.txt

@@ -24 +24 @@
   INSTALL(
     DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
-    DESTINATION share/doc
+    DESTINATION ${INSTALL_DOC_DIR}
     COMPONENT html_documentation)
 ENDIF(DOXYGEN_EXECUTABLE)

src/CMakeLists.txt

@@ -25 +25 @@
 INSTALL(
   TARGETS lemon-project
-  RUNTIME DESTINATION bin
+  RUNTIME DESTINATION ${INSTALL_BIN_DIR}
   COMPONENT bin
 )