summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cgal.mk1
-rw-r--r--src/gcc.mk5
-rw-r--r--src/qjson.mk1
-rw-r--r--src/vtk.mk1
-rw-r--r--src/wt.mk1
5 files changed, 3 insertions, 6 deletions
diff --git a/src/cgal.mk b/src/cgal.mk
index a5bab36..69e4a02 100644
--- a/src/cgal.mk
+++ b/src/cgal.mk
@@ -19,7 +19,6 @@ endef
define $(PKG)_BUILD
cd '$(1)' && cmake \
-DCGAL_INSTALL_CMAKE_DIR:STRING="lib/CGAL" \
- -DCMAKE_BUILD_TYPE:STRING="Release" \
-DCGAL_INSTALL_INC_DIR:STRING="include" \
-DCGAL_INSTALL_DOC_DIR:STRING="share/doc/CGAL-3.9" \
-DCGAL_INSTALL_BIN_DIR:STRING="bin" \
diff --git a/src/gcc.mk b/src/gcc.mk
index 9448c45..f002db6 100644
--- a/src/gcc.mk
+++ b/src/gcc.mk
@@ -59,9 +59,10 @@ define $(PKG)_BUILD
# create the CMake toolchain file
[ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))'
- (echo 'set(BUILD_SHARED_LIBS OFF)'; \
- echo 'set(CMAKE_SYSTEM_NAME Windows)'; \
+ (echo 'set(CMAKE_SYSTEM_NAME Windows)'; \
echo 'set(MSYS 1)'; \
+ echo 'set(BUILD_SHARED_LIBS OFF)'; \
+ echo 'set(CMAKE_BUILD_TYPE Release)'; \
echo 'set(CMAKE_FIND_ROOT_PATH $(PREFIX)/$(TARGET))'; \
echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \
echo 'set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)'; \
diff --git a/src/qjson.mk b/src/qjson.mk
index 7bb8422..08a3c45 100644
--- a/src/qjson.mk
+++ b/src/qjson.mk
@@ -20,7 +20,6 @@ define $(PKG)_BUILD
mkdir '$(1)/build'
cd '$(1)/build' && cmake .. \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
- -DCMAKE_BUILD_TYPE=Release \
-DLIBTYPE=STATIC
$(MAKE) -C '$(1)/build' -j '$(JOBS)' install
diff --git a/src/vtk.mk b/src/vtk.mk
index e1261e5..69acff9 100644
--- a/src/vtk.mk
+++ b/src/vtk.mk
@@ -21,7 +21,6 @@ define $(PKG)_BUILD
# first we need a native build to create the compile tools
mkdir '$(1)/native_build'
cd '$(1)/native_build' && cmake \
- -DCMAKE_BUILD_TYPE='Release' \
-DBUILD_TESTING=FALSE \
-DOPENGL_INCLUDE_DIR='$(1)/Utilities/ParseOGLExt/headers' \
-DVTK_USE_RENDERING=FALSE \
diff --git a/src/wt.mk b/src/wt.mk
index b25c63d..09bb55e 100644
--- a/src/wt.mk
+++ b/src/wt.mk
@@ -33,7 +33,6 @@ define $(PKG)_BUILD
-DPANGO_FT2_LIBS="`'$(TARGET)-pkg-config' --libs-only-l pangoft2`" \
-DWT_CMAKE_FINDER_INSTALL_DIR='/lib/wt' \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
- -DCMAKE_BUILD_TYPE:STRING="Release" \
'$(1)'
$(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1
endef