remove unneeded cmake vars specified by packages

src/alure.mk

@@ -20,8 +20,6 @@ endef
 define $(PKG)_BUILD
     cd '$(1)/build' && '$(TARGET)-cmake' \
         -DDYNLOAD=OFF \
-        -DBUILD_STATIC=ON \
-        -DBUILD_SHARED=OFF \
         -DBUILD_EXAMPLES=OFF \
         -DFLUIDSYNTH=OFF \
         -DCMAKE_C_FLAGS="-DAL_LIBTYPE_STATIC -DALURE_STATIC_LIBRARY" \

src/assimp.mk

@@ -25,8 +25,7 @@ define $(PKG)_BUILD
         -DASSIMP_ENABLE_BOOST_WORKAROUND=OFF \
         -DASSIMP_BUILD_ASSIMP_TOOLS=OFF \
         -DASSIMP_BUILD_SAMPLES=OFF      \
-        -DASSIMP_BUILD_TESTS=OFF        \
-        -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),OFF,ON)
+        -DASSIMP_BUILD_TESTS=OFF
     $(MAKE) -C '$(1)/build' -j '$(JOBS)' install VERBOSE=1
 
     '$(TARGET)-gcc' \

src/cgal.mk

@@ -23,7 +23,6 @@ define $(PKG)_BUILD
         -DCGAL_INSTALL_INC_DIR:STRING="include" \
         -DCGAL_INSTALL_DOC_DIR:STRING="share/doc/CGAL-$($(PKG)_VERSION)" \
         -DCGAL_INSTALL_BIN_DIR:STRING="bin" \
-        -DBUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \
         -DCGAL_Boost_USE_STATIC_LIBS:BOOL=$(CMAKE_STATIC_BOOL) \
         -DWITH_CGAL_Qt3:BOOL=OFF \
         -DWITH_OpenGL:BOOL=ON \

src/chipmunk.mk

@@ -23,11 +23,7 @@ define $(PKG)_BUILD
         -DBUILD_DEMOS=OFF \
         -DINSTALL_DEMOS=OFF \
         $(if $(BUILD_STATIC), \
-            -DBUILD_SHARED=OFF \
-            -DBUILD_STATIC=ON \
             -DINSTALL_STATIC=ON, \
-            -DBUILD_SHARED=ON \
-            -DBUILD_STATIC=OFF \
             -DINSTALL_STATIC=OFF)
 
     $(MAKE) -C '$(1)/build' -j '$(JOBS)' install

src/freeglut.mk

@@ -22,8 +22,8 @@ define $(PKG)_BUILD
         -DFREEGLUT_GLES=OFF \
         -DFREEGLUT_BUILD_DEMOS=OFF \
         -DFREEGLUT_REPLACE_GLUT=ON \
-        -DFREEGLUT_BUILD_STATIC_LIBS=$(if $(BUILD_STATIC),true,false) \
-        -DFREEGLUT_BUILD_SHARED_LIBS=$(if $(BUILD_STATIC),false,true)
+        -DFREEGLUT_BUILD_STATIC_LIBS=$(CMAKE_STATIC_BOOL) \
+        -DFREEGLUT_BUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL)
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
     $(MAKE) -C '$(1).build' -j 1 install
 

src/hyperscan.mk

@@ -21,7 +21,6 @@ define $(PKG)_BUILD
     # Add the following options to run on (virtual) machine without AVX2
     # -DCMAKE_C_FLAGS="-march=core2" -DCMAKE_CXX_FLAGS="-march=core2"
     cd '$(1).build' && '$(TARGET)-cmake' \
-        -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),OFF,ON) \
         -DRAGEL='$(PREFIX)/$(BUILD)/bin/ragel' \
         '$(1)'
     $(MAKE) -C '$(1).build' -j '$(JOBS)'

src/itk.mk

@@ -21,7 +21,6 @@ endef
 define $(PKG)_BUILD
     mkdir '$(1).build'
     cd '$(1).build' && '$(TARGET)-cmake' \
-        -DBUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \
         -DCMAKE_VERBOSE_MAKEFILE=TRUE \
         -DITK_FORBID_DOWNLOADS=TRUE \
         -DBUILD_TESTING=FALSE \

src/jsoncpp.mk

@@ -25,7 +25,6 @@ define $(PKG)_BUILD
     cd '$(1)/build' && '$(TARGET)-cmake' .. \
         -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \
         -DCMAKE_CXX_FLAGS="$($(PKG)_CXXFLAGS)" \
-        -DJSONCPP_WITH_CMAKE_PACKAGE=ON \
-        -DBUILD_STATIC_LIBS=$(if $(BUILD_STATIC),true,false)
+        -DJSONCPP_WITH_CMAKE_PACKAGE=ON
     $(MAKE) -C '$(1)/build' -j '$(JOBS)' install
 endef

src/lensfun.mk

@@ -20,7 +20,6 @@ endef
 define $(PKG)_BUILD
     mkdir '$(1)/building'
     cd '$(1)/building' && '$(TARGET)-cmake' .. \
-        -DBUILD_STATIC=$(if $(BUILD_STATIC),TRUE,FALSE) \
         -DINSTALL_IN_TREE=NO
     $(MAKE) -C '$(1)/building' -j '$(JOBS)' install VERBOSE=1
 

src/libcomm14cux.mk

@@ -12,8 +12,7 @@ $(PKG)_DEPS     := gcc
 
 define $(PKG)_BUILD
     mkdir '$(1)/build'
-    cd '$(1)/build' && '$(TARGET)-cmake' .. \
-        -DBUILD_STATIC=$(if $(BUILD_STATIC),ON,OFF)
+    cd '$(1)/build' && '$(TARGET)-cmake' ..
 
     $(MAKE) -C '$(1)/build' -j '$(JOBS)' install
 endef

src/libftdi1.mk

@@ -19,8 +19,8 @@ endef
 
 define $(PKG)_BUILD
     cd '$(1)' && '$(TARGET)-cmake' . \
-        -DSHAREDLIBS=$(if $(BUILD_SHARED),yes,no) \
-        -DSTATICLIBS=$(if $(BUILD_SHARED),no,yes) \
+        -DSHAREDLIBS=$(CMAKE_SHARED_BOOL) \
+        -DSTATICLIBS=$(CMAKE_STATIC_BOOL) \
         -DLIBUSB_INCLUDE_DIR=$(PREFIX)/$(TARGET)/include/libusb-1.0 \
         -DDOCUMENTATION=no \
         -DEXAMPLES=no \

src/librosco.mk

@@ -17,7 +17,6 @@ endef
 define $(PKG)_BUILD
     mkdir '$(1)/build'
     cd '$(1)/build' && '$(TARGET)-cmake' .. \
-        -DBUILD_STATIC=$(if $(BUILD_STATIC),ON,OFF) \
         -DENABLE_DOC_INSTALL=off \
         -DENABLE_TESTAPP_INSTALL=off
 

src/mman-win32.mk

@@ -16,8 +16,7 @@ $(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, witwall/mman-win32, master) | $(SED)
 define $(PKG)_BUILD
     mkdir '$(1).build'
     cd    '$(1).build' && '$(TARGET)-cmake' '$(1)'\
-        -DBUILD_TESTS=OFF \
-        $(if $(BUILD_STATIC),-DBUILD_SHARED_LIBS=OFF)
+        -DBUILD_TESTS=OFF
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
     $(MAKE) -C '$(1).build' -j 1 install
 

src/ossim.mk

@@ -20,7 +20,6 @@ endef
 define $(PKG)_BUILD
     mkdir '$(1).build'
     cd '$(1).build' && '$(TARGET)-cmake' \
-        -DBUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \
         -DCMAKE_VERBOSE_MAKEFILE=TRUE \
         -DPKG_CONFIG_EXECUTABLE='$(PREFIX)/bin/$(TARGET)-pkg-config' \
         -DCMAKE_MODULE_PATH='$(1)/ossim_package_support/cmake/CMakeModules' \

src/qhttpengine.mk

@@ -12,8 +12,7 @@ $(PKG)_DEPS     := gcc qtbase
 
 define $(PKG)_BUILD
     mkdir '$(1)/build'
-    cd '$(1)/build' && '$(TARGET)-cmake' .. \
-        -DBUILD_STATIC=$(if $(BUILD_STATIC),ON,OFF)
+    cd '$(1)/build' && '$(TARGET)-cmake' ..
 
     $(MAKE) -C '$(1)/build' -j '$(JOBS)' install
 endef

src/qtsparkle_qt4.mk

@@ -17,8 +17,7 @@ endef
 
 define $(PKG)_BUILD
     mkdir '$(1).build'
-    cd '$(1).build' && '$(TARGET)-cmake' '$(1)' \
-        -DBUILD_STATIC=$(CMAKE_STATIC_BOOL)
+    cd '$(1).build' && '$(TARGET)-cmake' '$(1)'
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
     $(MAKE) -C '$(1).build' -j 1 install
 

src/tinyxml2.mk

@@ -17,10 +17,7 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(BUILD_DIR)' && '$(TARGET)-cmake' \
-        -DBUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \
-        -DBUILD_STATIC_LIBS=$(CMAKE_STATIC_BOOL) \
-        '$(SOURCE_DIR)'
+    cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)'
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
     $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 

src/vtk6.mk

@@ -42,7 +42,6 @@ define $(PKG)_BUILD
     cd '$(1).cross_build' && '$(TARGET)-cmake' \
         -C '$(1)/TryRunResults.cmake' \
         -DVTKCompileTools_DIR='$(1).native_build' \
-        -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),FALSE,TRUE) \
         -DModule_vtkGUISupportQt=TRUE \
         -DModule_vtkGUISupportQtOpenGL=TRUE \
         -DModule_vtkViewsQt=TRUE \

src/xxhash.mk

@@ -18,10 +18,7 @@ endef
 
 define $(PKG)_BUILD
     mkdir '$(1).build'
-    cd '$(1).build' && $(TARGET)-cmake \
-        -DBUILD_STATIC_LIBS=$(CMAKE_STATIC_BOOL) \
-        -DBUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \
-        '$(1)/cmake_unofficial'
+    cd '$(1).build' && '$(TARGET)-cmake' '$(1)/cmake_unofficial'
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
     $(MAKE) -C '$(1).build' -j 1 install
 

src/yaml-cpp.mk

@@ -16,10 +16,7 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(BUILD_DIR)' && $(TARGET)-cmake \
-        -DBUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \
-        '$(SOURCE_DIR)'
-
+    cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)'
     $(MAKE) -C '$(BUILD_DIR)' -j $(JOBS) VERBOSE=1
     $(MAKE) -C '$(BUILD_DIR)' -j 1 install