Skip to content
Permalink
Browse files

- remove CMAKE_BUILD_TYPE from osgeo4w nightly configuration

- rename 'our' astyle to qgisstyle
  • Loading branch information
jef-n committed Aug 7, 2012
1 parent fce3691 commit 511e89ca36871d90855b480c25eac265e287cfef
Showing with 5 additions and 7 deletions.
  1. +0 −1 cmake/FindSPATIALITE.cmake
  2. +1 −2 ms-windows/osgeo4w/package-nightly.cmd
  3. +2 −2 scripts/astyle.sh
  4. +2 −2 src/astyle/CMakeLists.txt
@@ -44,7 +44,6 @@ FIND_PATH(SPATIALITE_INCLUDE_DIR spatialite.h
"$ENV{LIB_DIR}/include/spatialite"
)

MESSAGE(STATUS "LIB:${LIB} LIB_DIR:${LIB_DIR}")
FIND_LIBRARY(SPATIALITE_LIBRARY NAMES spatialite spatialite_i PATHS
$ENV{LIB}
$ENV{LIB_DIR}/lib
@@ -97,7 +97,6 @@ cmake -G "Visual Studio 9 2008" ^
-D WITH_ASTYLE=TRUE ^
-D WITH_GLOBE=TRUE ^
-D WITH_TOUCH=TRUE ^
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
-D GEOS_LIBRARY=%O4W_ROOT%/lib/geos_c_i.lib ^
-D SQLITE3_LIBRARY=%O4W_ROOT%/lib/sqlite3_i.lib ^
@@ -115,7 +114,7 @@ cmake -G "Visual Studio 9 2008" ^
-D QWT_INCLUDE_DIR=%O4W_ROOT%/include/qwt ^
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt5.lib ^
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /Od /D NDEBUG" ^
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /Od /D NDEBUG /D QGISDEBUG" ^
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
%SRCDIR%>>%LOG% 2>&1
@@ -1,6 +1,6 @@
#!/bin/bash

for ASTYLE in $(dirname $0)/astyle $(dirname $0)/RelWithDebInfo/astyle
for ASTYLE in $(dirname $0)/qgisstyle $(dirname $0)/RelWithDebInfo/qgisstyle
do
if type -p $ASTYLE >/dev/null; then
break
@@ -9,7 +9,7 @@ do
done

if [ -z "$ASTYLE" ]; then
echo "astyle not found - please enable WITH_ASTYLE in cmake and build it" >&2
echo "qgisstyle not found - please enable WITH_ASTYLE in cmake and build it" >&2
exit 1
fi

@@ -1,3 +1,3 @@
SET(ASTYLE_SRCS astyle_main.cpp ASBeautifier.cpp ASFormatter.cpp ASEnhancer.cpp ASResource.cpp)
ADD_EXECUTABLE(astyle ${ASTYLE_SRCS})
SET_TARGET_PROPERTIES(astyle PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/scripts)
ADD_EXECUTABLE(qgisstyle ${ASTYLE_SRCS})
SET_TARGET_PROPERTIES(qgisstyle PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/scripts)

0 comments on commit 511e89c

Please sign in to comment.
You can’t perform that action at this time.