[Kst] branches/work/kst/portto4/kst

[Peter Kümmel]

SVN commit 1219742 by kuemmel:

don't break qmake

 M  +2 -3      cmake/src/kst/CMakeLists.txt  
 M  +1 -1      src/kst/kst_icon.rc  


--- branches/work/kst/portto4/kst/cmake/src/kst/CMakeLists.txt #1219741:1219742
@@ -5,15 +5,14 @@
 kst_files_find(src/kst)
 
 if(WIN32)
-	configure_file(${kst_dir}/src/kst/kst_icon.rc ${CMAKE_CURRENT_BINARY_DIR}/kst_icon.rc)
 	if(MINGW)
 	    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kst_icon.o
 		                   COMMAND windres.exe -I${CMAKE_CURRENT_BINARY_DIR}
-		                   -i${CMAKE_CURRENT_BINARY_DIR}/kst_icon.rc
+		                   -i${kst_dir}/src/kst/kst_icon.rc
 		                   -o ${CMAKE_CURRENT_BINARY_DIR}/kst_icon.o)
 		set(rc_file ${CMAKE_CURRENT_BINARY_DIR}/kst_icon.o)
 	else()
-		set(rc_file ${CMAKE_CURRENT_BINARY_DIR}/kst_icon.rc)
+		set(rc_file ${kst_dir}/src/kst/kst_icon.rc)
 	endif()
 endif()
 
--- branches/work/kst/portto4/kst/src/kst/kst_icon.rc #1219741:1219742
@@ -1 +1 @@
-IDI_ICON1               ICON    DISCARDABLE     "${kst_dir}/src/images/kst.ico"
+IDI_ICON1               ICON    DISCARDABLE     "../images/kst.ico"