Browse Source

macosx/framework: Fix a bit the cmake generation script.

Pierre d'Herbemont 17 years ago
parent
commit
354870ab52
1 changed files with 3 additions and 4 deletions
  1. 3 4
      VLCKit.xcodeproj/project.pbxproj

+ 3 - 4
VLCKit.xcodeproj/project.pbxproj

@@ -426,11 +426,11 @@
 				"$(SRCROOT)/../../../extras/buildsystem/cmake/scripts/convert_vlc_to_cmake.sh",
 				"$(SRCROOT)/../../../extras/buildsystem/cmake/scripts/convert_vlc_to_cmake.sh",
 			);
 			);
 			outputPaths = (
 			outputPaths = (
-				$SRCROOT/../../../CMakeLists.txt,
+				"$(SRCROOT)/../../../CMakeLists.txt",
 			);
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellPath = /bin/sh;
-			shellScript = "top_srcdir=`pwd`/../../..\n\nif test $ACTION = \"clean\"\nthen\n    rm -f $top_srcdir/CMakeLists.txt\n    exit 0\nfi\n\ncd $top_srcdir && ./extras/buildsystem/cmake/scripts/convert_vlc_to_cmake.sh";
+			shellScript = "top_srcdir=`pwd`/../../..\n\nif test $ACTION = \"clean\"\nthen\n    rm -f $SYMROOT/vlc_build_dir/CMakeLists.txt\n    exit 0\nfi\n\necho \"$SRCROOT/../../../CMakeLists.txt doesn't exists\"\ncd $top_srcdir && ./extras/buildsystem/cmake/scripts/convert_vlc_to_cmake.sh\n";
 			showEnvVarsInLog = 0;
 			showEnvVarsInLog = 0;
 		};
 		};
 		633BD6E30D2ADF030012A314 /* ShellScript */ = {
 		633BD6E30D2ADF030012A314 /* ShellScript */ = {
@@ -469,14 +469,13 @@
 			files = (
 			files = (
 			);
 			);
 			inputPaths = (
 			inputPaths = (
-				$SRCROOT/../../../CMakeLists.txt,
 			);
 			);
 			outputPaths = (
 			outputPaths = (
 				$SYMROOT/vlc_build_dir/CMakeCache.txt,
 				$SYMROOT/vlc_build_dir/CMakeCache.txt,
 			);
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellPath = /bin/sh;
-			shellScript = "if test $ACTION = \"clean\"\nthen\n    exit 0\nfi\ntop_srcdir=`pwd`/../../..\nmkdir -p $SYMROOT/vlc_build_dir\nrm -Rf $top_srcdir/CMakeCache.txt\ncd $SYMROOT/vlc_build_dir && $top_srcdir/extras/contrib/bin/cmake $top_srcdir";
+			shellScript = "echo $ACTION\nif test $ACTION = \"clean\"\nthen\n\trm -Rf $SYMROOT/vlc_build_dir\n     exit 0\nfi\n\ntop_srcdir=`pwd`/../../..\n\nif ! test -e $SYMROOT/vlc_build_dir/CMakeCache.txt\nthen\n\techo \"$SYMROOT/vlc_build_dir/CMakeCache.txt exists\"\n\tmkdir -p $SYMROOT/vlc_build_dir\n\trm -Rf $top_srcdir/CMakeCache.txt\n\tcd $SYMROOT/vlc_build_dir && $top_srcdir/extras/contrib/bin/cmake $top_srcdir -DENABLE_NO_SYMBOL_CHECK=ON$top_srcdir\nfi";
 			showEnvVarsInLog = 0;
 			showEnvVarsInLog = 0;
 		};
 		};
 		EF78BD2E0CAEEF9500354E6E /* ShellScript */ = {
 		EF78BD2E0CAEEF9500354E6E /* ShellScript */ = {