add RAWTOACES_DATA_PATH env var; clean up public headers

Signed-off-by: Anton Dukhovnikov <antond@wetafx.co.nz>

Author: antond-weta

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 project( RAWTOACES )
 
 set( RAWTOACES_MAJOR_VERSION 1 )
@@ -64,6 +64,7 @@ else ()
   set ( DO_SHARED STATIC )
 endif ()
 
+include ( GNUInstallDirs )
 include ( configure.cmake )
 
 
@@ -95,13 +96,38 @@ install( FILES
   "${PROJECT_BINARY_DIR}/RAWTOACESConfigVersion.cmake"
   DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev)
 
+
+
+install(
+    TARGETS rawtoaces_idt rawtoaces_util rawtoaces_util2 rawtoaces
+    EXPORT RawToAcesConfig
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+
+export(
+    TARGETS rawtoaces_idt rawtoaces_util rawtoaces_util2 rawtoaces
+    NAMESPACE RawToAces::
+    FILE "${CMAKE_CURRENT_BINARY_DIR}/RawToAcesConfig.cmake"
+)
+
+install(
+    EXPORT RawToAcesConfig
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/CMake/RawToAces"
+    NAMESPACE RawToAces::
+)
+
+
+
+
 if ( WIN32 AND NOT CYGWIN )
 install( FILES "${PROJECT_BINARY_DIR}/RAWTOACESLibraryDepends.cmake" DESTINATION
   "${INSTALL_CMAKE_DIR}" COMPONENT dev )
 endif( )
 
 if ( APPLE OR UNIX )
-	install (DIRECTORY data DESTINATION include/rawtoaces)
+	install (DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATADIR}/rawtoaces)
 endif()
 
 enable_testing()

include/rawtoaces/acesrender.h

@@ -56,6 +56,7 @@
 #define _ACESRENDER_h__
 
 #include <rawtoaces/rta.h>
+#include <rawtoaces/define.h>
 #include <libraw/libraw.h>
 #include <unordered_map>
 

include/rawtoaces/define.h

@@ -460,16 +460,36 @@ inline dataPath &pathsFinder()
 
     if ( firstTime )
     {
-        string      path;
-        const char *env;
+#if defined( WIN32 ) || defined( WIN64 )
+        char separator = ';';
+#else
+        char separator = ':';
+#endif
 
+        string          path;
         vector<string> &PATHs = cdp.paths;
-        env                   = getenv( "AMPAS_DATA_PATH" );
 
-        if ( env )
-            path = env;
+        {
+            const char *env = getenv( "AMPAS_DATA_PATH" );
+            if ( env != nullptr )
+            {
+                if ( !path.empty() )
+                    path += separator;
+                path += env;
+            }
+        }
 
-        if ( path == "" )
+        {
+            const char *env = getenv( "RAWTOACES_DATA_PATH" );
+            if ( env != nullptr )
+            {
+                if ( !path.empty() )
+                    path += separator;
+                path += env;
+            }
+        }
+
+        if ( path.empty() )
         {
 #if defined( WIN32 ) || defined( WIN64 )
             path   = ".";
@@ -486,11 +506,7 @@ inline dataPath &pathsFinder()
 
         while ( pos < path.size() )
         {
-#if defined( WIN32 ) || defined( WIN64 )
-            size_t end = path.find( ';', pos );
-#else
-            size_t end = path.find( ':', pos );
-#endif
+            size_t end = path.find( separator, pos );
 
             if ( end == string::npos )
                 end = path.size();

include/rawtoaces/rta.h

@@ -55,8 +55,8 @@
 #ifndef _RTA_h__
 #define _RTA_h__
 
-#include "define.h"
-
+#include <string>
+#include <vector>
 #include <stdint.h>
 
 #include "metadata.h"

src/rawtoaces/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" )
 
 add_executable( rawtoaces

src/rawtoaces2/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" )
 
 add_executable( rawtoaces2

src/rawtoaces2/main.cpp

@@ -10,8 +10,8 @@ using namespace rta;
 
 int main( int argc, const char *argv[] )
 {
-
     OIIO::ArgParse argParse;
+    argParse.arg( "filename" ).action( OIIO::ArgParse::append() ).hidden();
 
     ImageConverter converter;
     converter.init_parser( argParse );

src/rawtoaces_idt/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" )
 
 add_library( ${RAWTOACESIDTLIB} ${DO_SHARED}
@@ -8,13 +8,14 @@ add_library( ${RAWTOACESIDTLIB} ${DO_SHARED}
     ../../include/rawtoaces/define.h
     ../../include/rawtoaces/mathOps.h
     ../../include/rawtoaces/rta.h
+    ../../include/rawtoaces/metadata.h
 )
 
 set_property(TARGET ${RAWTOACESIDTLIB} PROPERTY CXX_STANDARD 17)
 
 target_link_libraries(
     ${RAWTOACESIDTLIB}
-    PUBLIC
+    PRIVATE
         Boost::boost
         Boost::system
         Imath::Imath

src/rawtoaces_util/CMakeLists.txt

@@ -1,8 +1,11 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" )
 
 add_library ( ${RAWTOACESLIB} ${DO_SHARED}
     acesrender.cpp
+    
+    # Make the headers visible in IDEs. This should not affect the builds.
+    ../../include/rawtoaces/acesrender.h
 )
 
 set_property(TARGET ${RAWTOACESLIB} PROPERTY CXX_STANDARD 17)
@@ -11,7 +14,7 @@ if ( AcesContainer_FOUND )
     target_include_directories ( ${RAWTOACESLIB} PRIVATE ${AcesContainer_INCLUDE_DIRS} )
     target_link_directories    ( ${RAWTOACESLIB} PUBLIC  ${AcesContainer_LIBRARY_DIRS} )
     target_link_libraries      ( ${RAWTOACESLIB}
-        PUBLIC
+        PRIVATE
             ${AcesContainer_LIBRARIES}
             ${AcesContainer_LDFLAGS_OTHER}
     )

src/rawtoaces_util2/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" )
 
 add_library ( rawtoaces_util2 ${DO_SHARED}
@@ -19,8 +19,9 @@ if ( OIIO_FOUND )
 endif()
 
 target_link_libraries ( rawtoaces_util2
-    PUBLIC
+    PRIVATE
         ${RAWTOACESIDTLIB}
+    PUBLIC
         OpenImageIO::OpenImageIO
 )