polish

bootstrap.macports

@@ -55,6 +55,11 @@ cmake -G "$MAKEFILES_TYPE" . \
       -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
       -DCMAKE_OSX_ARCHITECTURES=${TARGET_TYPE} \
       -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} ${EXTRA_CXX_FLAGS}" \
+      -DCMAKE_COLOR_MAKEFILE=ON \
+      -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
+      -DCMAKE_INSTALL_NAME_DIR=${INSTALL_PREFIX}/lib \
+      -DCMAKE_SYSTEM_PREFIX_PATH="${INSTALL_PREFIX};/usr" \
+      -DCMAKE_MODULE_PATH="${INSTALL_PREFIX}/share/cmake/modules" \
       -DEXIV2_ENABLE_SHARED=ON \
       -DEXIV2_ENABLE_XMP=ON \
       -DEXIV2_ENABLE_LIBXMP=ON \
@@ -71,13 +76,4 @@ cmake -G "$MAKEFILES_TYPE" . \
       -DEXIV2_ENABLE_CURL=ON \
       -DEXIV2_ENABLE_SSH=ON \
       -Wno-dev \
-      -DCMAKE_COLOR_MAKEFILE=ON \
-      -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-      -DCMAKE_INSTALL_NAME_DIR=${INSTALL_PREFIX}/lib \
-      -DCMAKE_SYSTEM_PREFIX_PATH="${INSTALL_PREFIX};/usr" \
-      -DCMAKE_MODULE_PATH="${INSTALL_PREFIX}/share/cmake/modules" \
-      -DBUNDLE_INSTALL_DIR=${BUNDLE_INSTALL_DIR} \
-      -DQT_QT_INCLUDE_DIR=${INSTALL_PREFIX}/include \
-      -DQT_LIBRARY_DIR=${INSTALL_PREFIX}/lib \
-      -DQT_QMAKE_EXECUTABLE=${INSTALL_PREFIX}/bin/qmake \
       ..