Changeset 1201

Timestamp:

01/07/08 13:50:35 (3 years ago)

Author:

ahodgkinson

Message:

digitalme: More build changes.

Location:

trunk/digitalme

Files:

• AUTHORS (added)
• CMakeLists.txt (modified) (3 diffs)
• COPYING (added)
• COPYRIGHT (added)
• INSTALL (added)
• NEWS (added)
• README (added)
• TODO (added)
• ui/gtk/src/CMakeLists.txt (modified) (3 diffs)

trunk/digitalme/CMakeLists.txt

@@ -93 +93 @@
 set( EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH
     "Single output directory for building all executables.")
-set( RESOURCE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/resources CACHE PATH
+set( BUILD_RESOURCE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/resources CACHE PATH
          "Project resources directory.")
-set( CERT_OUTPUT_PATH ${RESOURCE_OUTPUT_PATH}/certs)
 mark_as_advanced( LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH 
-        RESOURCE_OUTPUT_PATH CERT_OUTPUT_PATH)  
+        BUILD_RESOURCE_OUTPUT_PATH CERT_OUTPUT_PATH)    
 
 # Create output directories
 
-if( NOT EXISTS ${RESOURCE_OUTPUT_PATH})
-        file( MAKE_DIRECTORY ${RESOURCE_OUTPUT_PATH})
-endif( NOT EXISTS ${RESOURCE_OUTPUT_PATH})
+if( NOT EXISTS ${BUILD_RESOURCE_OUTPUT_PATH})
+        file( MAKE_DIRECTORY ${BUILD_RESOURCE_OUTPUT_PATH})
+endif( NOT EXISTS ${BUILD_RESOURCE_OUTPUT_PATH})
 
 # Set the project version
@@ -222 +221 @@
 # Copy resources to the output directory
 
-if( RESOURCE_OUTPUT_PATH)
-        set( CERT_INPUT_PATH ./ftk/certs)
-        
-        file( GLOB cert_resource_files ${CERT_INPUT_PATH}/*.crt)
-
-        if( NOT EXISTS ${CERT_OUTPUT_PATH})
-                file( MAKE_DIRECTORY ${CERT_OUTPUT_PATH})
-        endif( NOT EXISTS ${CERT_OUTPUT_PATH})
-
-        foreach( resource_file ${cert_resource_files})
-                execute_process( COMMAND ${CMAKE_COMMAND}
-                        -E copy ${resource_file} ${CERT_OUTPUT_PATH})
-        endforeach( resource_file)
-endif( RESOURCE_OUTPUT_PATH)
-
 # Install
 
-install(
-        FILES ${CERT_OUTPUT_PATH}/ca-bundle.crt 
-        DESTINATION ${PRODUCT_INSTALL_PREFIX}/certs
-)
-
 if( SOURCE_INSTALL_PREFIX)
 
-        install(
-                FILES ${CERT_OUTPUT_PATH}/ca-bundle.crt 
-                DESTINATION ${SOURCE_INSTALL_PREFIX}/certs
-        )
-        
         install(
                 FILES CMakeLists.txt
@@ -260 +234 @@
                 DESTINATION ${SOURCE_INSTALL_PREFIX}
                 PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
-        )
-        
-        file( GLOB CUSTOM_CMAKE_MODULES 
-                ${CMAKE_MODULE_PATH}/*.cmake)
-        
-        install(
-                FILES ${CUSTOM_CMAKE_MODULES}
-                DESTINATION ${SOURCE_INSTALL_PREFIX}/CMakeModules
         )
         

trunk/digitalme/ui/gtk/src/CMakeLists.txt

@@ -70 +70 @@
 
 file( WRITE ${PROJECT_BINARY_DIR}/output_gtk_resources.cmake 
-        "set( GTK_RESOURCE_OUTPUT_PATH ${RESOURCE_OUTPUT_PATH}/gtk)\n"
+        "set( GTK_BUILD_RESOURCE_OUTPUT_PATH ${BUILD_RESOURCE_OUTPUT_PATH}/gtk)\n"
         "\n"
-        "if( NOT EXISTS \${GTK_RESOURCE_OUTPUT_PATH})\n"
-        "       file( MAKE_DIRECTORY \${GTK_RESOURCE_OUTPUT_PATH})\n"
-        "endif( NOT EXISTS \${GTK_RESOURCE_OUTPUT_PATH})\n"
+        "if( NOT EXISTS \${GTK_BUILD_RESOURCE_OUTPUT_PATH})\n"
+        "       file( MAKE_DIRECTORY \${GTK_BUILD_RESOURCE_OUTPUT_PATH})\n"
+        "endif( NOT EXISTS \${GTK_BUILD_RESOURCE_OUTPUT_PATH})\n"
         "\n"
         "foreach( resource_file ${gtk_resource_files})\n"
         "       execute_process( COMMAND \${CMAKE_COMMAND}\n"
-        "               -E copy \${resource_file} \${GTK_RESOURCE_OUTPUT_PATH})\n"
+        "               -E copy \${resource_file} \${GTK_BUILD_RESOURCE_OUTPUT_PATH})\n"
         "endforeach( resource_file)"
 )
@@ -96 +96 @@
         install(
                 FILES ${gtk_resource_files}
-                DESTINATION ${PRODUCT_INSTALL_PREFIX}/ui/gtk/resources
+                DESTINATION ${PRODUCT_INSTALL_PREFIX}/resources/gtk
         )
         
@@ -103 +103 @@
                 install(
                         FILES ${gtk_resource_files}
-                        DESTINATION ${SOURCE_INSTALL_PREFIX}/ui/gtk
+                        DESTINATION ${SOURCE_INSTALL_PREFIX}/ui/gtk/resources
                 )