debug

Signed-off-by: Larry Gritz <[email protected]>
lgritz · Mar 29, 2024 · be3033b · be3033b
1 parent b0d8313
commit be3033b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/cmake/build_Imath.cmake b/src/cmake/build_Imath.cmake
@@ -44,14 +44,14 @@ get_target_property(IMATH_INCLUDES Imath::Imath INTERFACE_INCLUDE_DIRECTORIES)
 # downloaded Imath.
 message (STATUS "In build_Imath.cmake, Imath_INCLUDES=${IMATH_INCLUDES}")
 set (IMATH_INCLUDES "${Imath_SOURCE_DIR}/src/Imath"
-                    "${Imath_BINARY_DIR}/src/config")
+                    "${Imath_BINARY_DIR}/config")
 message (STATUS "Resetting to Imath_INCLUDES=${IMATH_INCLUDES}")
 
 # Need a link so that we can #include <Imath/blah.h> because in the Imath
 # source, the headers are not in an Imath subdirectory.
 file (CREATE_LINK ${Imath_SOURCE_DIR}/src/Imath ${Imath_SOURCE_DIR}/src/Imath/Imath SYMBOLIC)
 
 proj_include_directories_prepend ("${Imath_SOURCE_DIR}/src/Imath"
-                                  "${Imath_BINARY_DIR}/src/config")
+                                  "${Imath_BINARY_DIR}/config")
 # set (${PROJECT_NAME}_include_directories "${Imath_SOURCE_DIR}/src/Imath;${Imath_BINARY_DIR}/src/config;${${PROJECT_NAME}_include_directories}")
 message ("After build_imath, now ${PROJECT_NAME}_include_directories = ${${PROJECT_NAME}_include_directories}}")
diff --git a/src/cmake/build_OpenEXR.cmake b/src/cmake/build_OpenEXR.cmake
@@ -30,13 +30,13 @@ set (OpenEXR_VERSION ${OpenEXR_LOCAL_BUILD_VERSION})
 # the install creates this but if we're using the library locally we
 # haven't installed the header files yet, so need to extract those
 # and make a variable for header only usage
-if(NOT TARGET OpenEXR::OpenEXRConfig)
-    get_target_property(openexrinc OpenEXR INTERFACE_INCLUDE_DIRECTORIES)
-    get_target_property(openexrconfinc OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
-    list(APPEND openexrinc ${openEXRconfinc})
-    set(OPENEXR_HEADER_ONLY_INCLUDE_DIRS ${openexrinc})
-    message(STATUS "OpenEXR interface dirs ${OPENEXR_HEADER_ONLY_INCLUDE_DIRS}")
-endif()
+# if(NOT TARGET OpenEXR::OpenEXRConfig)
+#     get_target_property(openexrinc OpenEXR INTERFACE_INCLUDE_DIRECTORIES)
+#     get_target_property(openexrconfinc OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
+#     list(APPEND openexrinc ${openEXRconfinc})
+#     set(OPENEXR_HEADER_ONLY_INCLUDE_DIRS ${openexrinc})
+#     message(STATUS "OpenEXR interface dirs ${OPENEXR_HEADER_ONLY_INCLUDE_DIRS}")
+# endif()
 
 
 
@@ -55,3 +55,5 @@ message (STATUS "Resetting to OpenEXR_INCLUDES=${OPENEXR_INCLUDES}")
 # source, the headers are not in an OpenEXR subdirectory.
 file (CREATE_LINK ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR SYMBOLIC)
 file (CREATE_LINK ${OPENEXRCORE_INCLUDE_DIR} ${OPENEXRCORE_INCLUDE_DIR}/OpenEXR SYMBOLIC)
+
+proj_include_directories_prepend (${OPENEXR_INCLUDES})
diff --git a/src/cmake/fancy_add_executable.cmake b/src/cmake/fancy_add_executable.cmake
@@ -43,8 +43,9 @@ macro (fancy_add_executable)
     check_is_enabled (${_target_NAME} _target_NAME_enabled)
     if (_target_NAME_enabled)
         add_executable (${_target_NAME} ${_target_SRC})
+        message(STATUS "in fancy_add_exec ${PROJECT_NAME}_include_directories = ${${PROJECT_NAME}_include_directories}")
         if (${PROJECT_NAME}_include_directories)
-            target_include_directories (${_target_NAME} ${${PROJECT_NAME}_include_directories})
+            target_include_directories (${_target_NAME} PRIVATE ${${PROJECT_NAME}_include_directories})
         endif ()
         if (_target_INCLUDE_DIRS)
             target_include_directories (${_target_NAME} PRIVATE ${_target_INCLUDE_DIRS})