From c5864def0281b684d526b556d6d3e65de6a96f1b Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 5 Nov 2016 23:21:50 +0100 Subject: remove unneeded cmake vars specified by packages --- src/alure.mk | 2 -- src/assimp.mk | 3 +-- src/cgal.mk | 1 - src/chipmunk.mk | 4 ---- src/freeglut.mk | 4 ++-- src/hyperscan.mk | 1 - src/itk.mk | 1 - src/jsoncpp.mk | 3 +-- src/lensfun.mk | 1 - src/libcomm14cux.mk | 3 +-- src/libftdi1.mk | 4 ++-- src/librosco.mk | 1 - src/mman-win32.mk | 3 +-- src/ossim.mk | 1 - src/qhttpengine.mk | 3 +-- src/qtsparkle_qt4.mk | 3 +-- src/tinyxml2.mk | 5 +---- src/vtk6.mk | 1 - src/xxhash.mk | 5 +---- src/yaml-cpp.mk | 5 +---- 20 files changed, 13 insertions(+), 41 deletions(-) diff --git a/src/alure.mk b/src/alure.mk index 0e82345..bcd3073 100644 --- a/src/alure.mk +++ b/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" \ diff --git a/src/assimp.mk b/src/assimp.mk index 6f286e8..82fb982 100644 --- a/src/assimp.mk +++ b/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' \ diff --git a/src/cgal.mk b/src/cgal.mk index 1433a6e..6bf1fee 100644 --- a/src/cgal.mk +++ b/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 \ diff --git a/src/chipmunk.mk b/src/chipmunk.mk index 354fc2a..8b525b6 100644 --- a/src/chipmunk.mk +++ b/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 diff --git a/src/freeglut.mk b/src/freeglut.mk index 628101f..f0ea60f 100644 --- a/src/freeglut.mk +++ b/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 diff --git a/src/hyperscan.mk b/src/hyperscan.mk index b405854..2161aa2 100644 --- a/src/hyperscan.mk +++ b/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)' diff --git a/src/itk.mk b/src/itk.mk index 4842cd9..7dc344b 100644 --- a/src/itk.mk +++ b/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 \ diff --git a/src/jsoncpp.mk b/src/jsoncpp.mk index 8f8d4b3..301f59f 100644 --- a/src/jsoncpp.mk +++ b/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 diff --git a/src/lensfun.mk b/src/lensfun.mk index f82b991..e102144 100644 --- a/src/lensfun.mk +++ b/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 diff --git a/src/libcomm14cux.mk b/src/libcomm14cux.mk index fa2cf98..1ef10d3 100644 --- a/src/libcomm14cux.mk +++ b/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 diff --git a/src/libftdi1.mk b/src/libftdi1.mk index 2968540..15455d6 100644 --- a/src/libftdi1.mk +++ b/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 \ diff --git a/src/librosco.mk b/src/librosco.mk index 9d8e901..d47057f 100644 --- a/src/librosco.mk +++ b/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 diff --git a/src/mman-win32.mk b/src/mman-win32.mk index de872ee..0cce9da 100644 --- a/src/mman-win32.mk +++ b/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 diff --git a/src/ossim.mk b/src/ossim.mk index c9f19fd..f421543 100644 --- a/src/ossim.mk +++ b/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' \ diff --git a/src/qhttpengine.mk b/src/qhttpengine.mk index b9592ae..b444568 100644 --- a/src/qhttpengine.mk +++ b/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 diff --git a/src/qtsparkle_qt4.mk b/src/qtsparkle_qt4.mk index d0b86d9..bf5d2eb 100644 --- a/src/qtsparkle_qt4.mk +++ b/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 diff --git a/src/tinyxml2.mk b/src/tinyxml2.mk index c313d07..af9a528 100644 --- a/src/tinyxml2.mk +++ b/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 diff --git a/src/vtk6.mk b/src/vtk6.mk index 7891466..980ff75 100644 --- a/src/vtk6.mk +++ b/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 \ diff --git a/src/xxhash.mk b/src/xxhash.mk index 4174813..15bbb9c 100644 --- a/src/xxhash.mk +++ b/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 diff --git a/src/yaml-cpp.mk b/src/yaml-cpp.mk index aaffe46..68797d1 100644 --- a/src/yaml-cpp.mk +++ b/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 -- cgit v0.12