Merge branch 'master' of github.com:cginternals/glkernel

Author: scheibel

.gitignore

@@ -39,4 +39,5 @@ build/
 
 # build directories
 build
+*-build*
 build-*

configure

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # Default options
+
 BUILD_DIR="build"
 CMAKE_GENERATOR="Unix Makefiles"
 BUILD_TYPE="Release"
@@ -99,19 +100,33 @@ do
     fi
 done
 
+if [ "$CMAKE_GENERATOR_OVERRIDE" != "" ]
+then
+  echo "Override CMAKE_GENERATOR to $CMAKE_GENERATOR_OVERRIDE"
+  CMAKE_GENERATOR="$CMAKE_GENERATOR_OVERRIDE"
+fi
+
+if [ -n "$BUILD_DIR_PREFIX" ]; then
+  BUILD_DIR="${BUILD_DIR_PREFIX}-${BUILD_DIR}"
+fi
+
 # Configure build
-echo "Configuring ..."
+echo "Configuring in \"$BUILD_DIR\""
 echo ""
 
 # Create build directory
-if [ ! -d "./$BUILD_DIR" ]
+if [ ! -d "$BUILD_DIR" ]
 then
-    mkdir $BUILD_DIR
+    mkdir -p "$BUILD_DIR"
 fi
 
 # Configure project
-cd $BUILD_DIR
-cmake -G "$CMAKE_GENERATOR" "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" $CMAKE_OPTIONS ..
+
+PREVIOUS_DIR=$(pwd)
+
+pushd $BUILD_DIR
+echo cmake -G "$CMAKE_GENERATOR" "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" $CMAKE_OPTIONS "$PREVIOUS_DIR"
+cmake -G "$CMAKE_GENERATOR" "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" $CMAKE_OPTIONS "$PREVIOUS_DIR"
 if [ $? == 0 ]
 then
     echo ""
@@ -122,5 +137,4 @@ else
     echo ""
     echo "Configuration failed.";
 fi
-
-cd ..
+popd

source/glkernel/CMakeLists.txt

@@ -3,7 +3,7 @@
 # External dependencies
 # 
 
-find_package(glm REQUIRED)
+find_package(glm CONFIG REQUIRED)
 
 
 # 

source/glkernel/include/glkernel/noise.hpp

@@ -310,7 +310,7 @@ void uniform(tkernel<V> & kernel, const typename V::value_type range_min, const
     kernel.template for_each<uniform_operator<typename V::value_type>>(range_min, range_max);
 }
 
-template <typename V, typename std::enable_if<std::is_floating_point<typename V::value_type>::value>::type * = nullptr>
+template <typename V, typename std::enable_if<std::is_floating_point<typename V::value_type>::value>::type *>
 void uniform(tkernel<V> & kernel, const V & range_min, const V & range_max)
 {
     kernel.template for_each<uniform_operator<typename V::value_type>>(range_min, range_max);
@@ -366,13 +366,13 @@ void normal(tkernel<T> & kernel, const T mean, const T stddev)
     kernel.template for_each<normal_operator<T>>(mean, stddev);
 }
 
-template <typename V, typename std::enable_if<std::is_floating_point<typename V::value_type>::value>::type * = nullptr>
+template <typename V, typename std::enable_if<std::is_floating_point<typename V::value_type>::value>::type *>
 void normal(tkernel<V> & kernel, const typename V::value_type mean, const typename V::value_type stddev)
 {
     kernel.template for_each<normal_operator<typename V::value_type>>(mean, stddev);
 }
 
-template <typename V, typename std::enable_if<std::is_floating_point<typename V::value_type>::value>::type * = nullptr>
+template <typename V, typename std::enable_if<std::is_floating_point<typename V::value_type>::value>::type *>
 void normal(tkernel<V> & kernel, const V & mean, const V & stddev)
 {
     kernel.template for_each<normal_operator<typename V::value_type>>(mean, stddev);

source/glkernel/include/glkernel/scale.hpp

@@ -61,7 +61,7 @@ void range(tkernel<T> & kernel, T rangeToLower, T rangeToUpper, T rangeFromLower
     kernel.template for_each_element<range_operator<T>>(rangeToLower, rangeToUpper, rangeFromLower, rangeFromUpper);
 }
 
-template <typename V, typename std::enable_if<std::is_floating_point<typename V::value_type>::value>::type * = nullptr>
+template <typename V, typename std::enable_if<std::is_floating_point<typename V::value_type>::value>::type *>
 void range(tkernel<V> & kernel, typename V::value_type rangeToLower, typename V::value_type rangeToUpper, typename V::value_type rangeFromLower, typename V::value_type rangeFromUpper)
 {
     kernel.template for_each_element<range_operator<typename V::value_type>>(rangeToLower, rangeToUpper, rangeFromLower, rangeFromUpper);

source/glkernel/include/glkernel/sequence.hpp

@@ -66,13 +66,13 @@ void uniform(tkernel<T> & kernel, const T range_min, const T range_max)
     kernel.template for_each<uniform_operator<T>>(range_min, range_max);
 }
 
-template<typename V, typename std::enable_if<std::is_floating_point<typename V::value_type>::value>::type * = nullptr>
+template<typename V, typename std::enable_if<std::is_floating_point<typename V::value_type>::value>::type *>
 void uniform(tkernel<V> & kernel, const typename V::value_type range_min, const typename V::value_type range_max)
 {
     kernel.template for_each<uniform_operator<typename V::value_type>>(range_min, range_max);
 }
 
-template<typename V, typename std::enable_if<std::is_floating_point<typename V::value_type>::value>::type * = nullptr>
+template<typename V, typename std::enable_if<std::is_floating_point<typename V::value_type>::value>::type *>
 void uniform(tkernel<V> & kernel, const V & range_min, const V & range_max)
 {
     kernel.template for_each<uniform_operator<typename V::value_type>>(range_min, range_max);

source/tests/glkernel-test/CMakeLists.txt

@@ -5,7 +5,7 @@
 
 find_package(${META_PROJECT_NAME} REQUIRED HINTS "${CMAKE_CURRENT_SOURCE_DIR}/../../../")
 
-find_package(glm REQUIRED)
+find_package(glm CONFIG REQUIRED)
 find_package(OpenMP QUIET)
 
 # 
@@ -71,7 +71,6 @@ set_target_properties(${target}
 target_include_directories(${target}
     PRIVATE
     ${DEFAULT_INCLUDE_DIRECTORIES}
-    glm::glm
     ${PROJECT_BINARY_DIR}/source/include
 )