Force build libcupla as archive

- downgrade required cmake version to 3.18
alpaka-group · Jul 13, 2021 · cf3d5e3 · cf3d5e3
1 parent d5f5ec5
commit cf3d5e3
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 26 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,7 +22,7 @@
 # Required cmake version.
 ################################################################################
 
-cmake_minimum_required(VERSION 3.19.0)
+cmake_minimum_required(VERSION 3.18.0)
 
 ################################################################################
 # Setup project information

diff --git a/INSTALL.md b/INSTALL.md
@@ -3,7 +3,7 @@
 ## Requirements
 
 
-- **cmake**  3.19.0 or higher
+- **cmake**  3.18.0 or higher
   - *Debian/Ubuntu:* `sudo apt-get install cmake file cmake-curses-gui`
   - *Arch Linux:* `sudo pacman --sync cmake`
 
@@ -75,7 +75,7 @@ cmake .. -Dcupla_BUILD_EXAMPLES=ON -Dcupla_ALPAKA_PROVIDER="external"
 If cupla is installed, you can use it via `find_package()` in your project:
 
 ```cmake
-cmake_minimum_required(VERSION 3.19.0)
+cmake_minimum_required(VERSION 3.18.0)
 project(exampleProject)
 
 find_package(cupla)
@@ -88,7 +88,7 @@ cupla_add_executable(${PROJECT_NAME} main.cpp)
 For the method `add_subdirectory()` you have to copy the `cupla` project folder into your project. After that you can add `cupla` to your project and use it.
 
 ```cmake
-cmake_minimum_required(VERSION 3.19.0)
+cmake_minimum_required(VERSION 3.18.0)
 project(exampleProject)
 
 # requires, that cupla is located in the root directory of your project

diff --git a/cmake/cuplaTargetHelper.cmake b/cmake/cuplaTargetHelper.cmake
@@ -26,6 +26,7 @@ macro(createCuplaTarget
     )
   alpaka_add_library(
     ${TARGET_NAME}
+    STATIC
     ${_CUPLA_SRC_DIR}/manager/Driver.cpp
     ${_CUPLA_SRC_DIR}/common.cpp
     ${_CUPLA_SRC_DIR}/device.cpp

diff --git a/example/CUDASamples/asyncAPI/CMakeLists.txt b/example/CUDASamples/asyncAPI/CMakeLists.txt
@@ -22,7 +22,7 @@
 # Required CMake version.
 ################################################################################
 
-cmake_minimum_required(VERSION 3.19.0)
+cmake_minimum_required(VERSION 3.18.0)
 
 ################################################################################
 # Project.

diff --git a/example/CUDASamples/asyncAPI_tuned/CMakeLists.txt b/example/CUDASamples/asyncAPI_tuned/CMakeLists.txt
@@ -23,7 +23,7 @@
 # Required CMake version.
 ################################################################################
 
-cmake_minimum_required(VERSION 3.19.0)
+cmake_minimum_required(VERSION 3.18.0)
 
 ################################################################################
 # Project.

diff --git a/example/CUDASamples/blackScholes/CMakeLists.txt b/example/CUDASamples/blackScholes/CMakeLists.txt
@@ -23,7 +23,7 @@
 # Required CMake version.
 ################################################################################
 
-cmake_minimum_required(VERSION 3.19.0)
+cmake_minimum_required(VERSION 3.18.0)
 
 ################################################################################
 # Project.

diff --git a/example/CUDASamples/cuplaVectorAdd/CMakeLists.txt b/example/CUDASamples/cuplaVectorAdd/CMakeLists.txt
@@ -22,7 +22,7 @@
 # Required CMake version.
 ################################################################################
 
-cmake_minimum_required(VERSION 3.19.0)
+cmake_minimum_required(VERSION 3.18.0)
 
 ################################################################################
 # Project.

diff --git a/example/CUDASamples/matrixMul/CMakeLists.txt b/example/CUDASamples/matrixMul/CMakeLists.txt
@@ -23,7 +23,7 @@
 # Required CMake version.
 ################################################################################
 
-cmake_minimum_required(VERSION 3.19.0)
+cmake_minimum_required(VERSION 3.18.0)
 
 ################################################################################
 # Project.

diff --git a/example/CUDASamples/vectorAdd/CMakeLists.txt b/example/CUDASamples/vectorAdd/CMakeLists.txt
@@ -22,7 +22,7 @@
 # Required CMake version.
 ################################################################################
 
-cmake_minimum_required(VERSION 3.19.0)
+cmake_minimum_required(VERSION 3.18.0)
 
 ################################################################################
 # Project.

diff --git a/script/integration/build_add_subdirectory.sh b/script/integration/build_add_subdirectory.sh
@@ -31,6 +31,4 @@ cmake --install .
 ##########################
 cd ../install
 ls
-# verify, that cupla lib is correct installed
-ls lib
 bin/cuplaVectorAdd
diff --git a/script/integration/build_find_package.sh b/script/integration/build_find_package.sh
@@ -29,6 +29,4 @@ cmake --install .
 ##########################
 cd ../install
 ls
-# verify, that cupla lib is correct installed
-ls lib
 bin/cuplaVectorAdd
diff --git a/test/integration/cupla_add_subdirectory.cmake b/test/integration/cupla_add_subdirectory.cmake
@@ -18,16 +18,11 @@
 # If not, see <http://www.gnu.org/licenses/>.
 #
 
-cmake_minimum_required(VERSION 3.19.0)
+cmake_minimum_required(VERSION 3.18.0)
 project(cuplaVectorAdd)
 
 add_subdirectory(cupla)
 
 cupla_add_executable(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/vectorAdd.cpp)
 
 install(TARGETS ${PROJECT_NAME})
-
-# install cupla library only, if it a shared library
-if(BUILD_SHARED_LIBS)
-  install(TARGETS cupla)
-endif()
diff --git a/test/integration/cupla_find_package.cmake b/test/integration/cupla_find_package.cmake
@@ -18,16 +18,11 @@
 # If not, see <http://www.gnu.org/licenses/>.
 #
 
-cmake_minimum_required(VERSION 3.19.0)
+cmake_minimum_required(VERSION 3.18.0)
 project(cuplaVectorAdd)
 
 find_package(cupla)
 
 cupla_add_executable(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/vectorAdd.cpp)
 
 install(TARGETS ${PROJECT_NAME})
-
-# install cupla library only, if it a shared library
-if(BUILD_SHARED_LIBS)
-  install(TARGETS cupla)
-endif()