Changeset 64eb621 in tol for CMakeLists.txt

Timestamp:

Jun 17, 2015, 11:58:36 AM (11 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

4a600df

Parents:

aa4a881

Message:

Refs #1827
Se modifican las rutas donde localizar los iconos.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@6767 be4846ae-f051-483a-831f-b64e7d08527f

File:

• CMakeLists.txt (modified) (4 diffs)

CMakeLists.txt

@@ -19 +19 @@
   file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/stdlib" stdlib_dir )
   install( DIRECTORY ${stdlib_dir} DESTINATION "bin" )
-  file( TO_CMAKE_PATH "${CMAKE_SOURCE_DIR}/tolbase-gnu.ico" ico_tolbase )
+  file( TO_CMAKE_PATH "${CMAKE_SOURCE_DIR}/tolbase/lib/toltk/images/tolbase-gnu.ico" ico_tolbase )
   install( FILES ${ico_tolbase} DESTINATION "bin" )
 endif( WIN32 )
@@ -39 +39 @@
 set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/tolbase/lib/toltk/images/splash-gnu.gif")
 string(REPLACE "/" "\\\\" CPACK_PACKAGE_ICON ${CPACK_PACKAGE_ICON})
-set( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/tol/COPYING" )
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/tol/COPYING" )
 string(REPLACE "/" "\\\\" CPACK_RESOURCE_FILE_LICENSE ${CPACK_RESOURCE_FILE_LICENSE})
-set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/tolbase/lib/toltk/images/tolbase-gnu.ico" )
+set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/NSIS/tolbase-install.ico" )
 string(REPLACE "/" "\\\\" CPACK_NSIS_MUI_ICON ${CPACK_NSIS_MUI_ICON})
-set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/tolbase/lib/toltk/images/tolbase-gnu.ico" )
+set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/NSIS/tolbase-uninstall.ico" )
 string(REPLACE "/" "\\\\" CPACK_NSIS_MUI_UNIICON ${CPACK_NSIS_MUI_UNIICON})
 
@@ -50 +50 @@
 
 if( WIN32 )
-  set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS 
-    "
+  set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
     Push \\\"TOLGNU_ROOT\\\"
     Push \\\"A\\\"
@@ -58 +57 @@
     Call EnvVarUpdate
     Pop  \\\$0" )  
-  set (CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "Push \\\"TOLGNU_ROOT\\\"
+  set (CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
+    Push \\\"TOLGNU_ROOT\\\"
     Push \\\"R\\\"
     Push \\\"HKCU\\\"